chiark / gitweb /
~mdw / tripe / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 224980b 29b6a37)
Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe 1.0.0pre9maemo1
authorMark Wooding <mdw@distorted.org.uk>
Mon, 17 May 2010 23:25:52 +0000 (00:25 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 17 May 2010 23:25:52 +0000 (00:25 +0100)
commit0a79c72d651b647fb9d56d09cbced8ba8bda2a90
tree85a68bd80e45add2de7e102847d37531af8ffa18tree | snapshot
parent224980bfc4801d0504925f812bbc69210f0cd215commit | diff
parent29b6a378ad93267a4de0863ffe042e432a70d353commit | diff
Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe

* 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe:
  debian/changelog: Another version.
  Disassociate public key tags from peer names.
  svc/conntrack: Make the kickpeers coroutine more robust.
  svc/conntrack.8.in: Document the D-Bus connection state notifications.
  peerdb/peers.in.5.in: Fix formatting.

Conflicts:
debian/changelog
debian/changelog diff1 | diff2 | blob | history
Trivial IP Encryption: a simple VPN