projects / 6bed4 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94c2e0f dc66645)
Merge branch 'master' of /var/git/6bed4
authorRick van Rein <vanrein@phantom.vanrein.org>
Tue, 20 Mar 2012 08:55:00 +0000 (09:55 +0100)
committerRick van Rein <vanrein@phantom.vanrein.org>
Tue, 20 Mar 2012 08:55:00 +0000 (09:55 +0100)
Conflicts:

6bed4router.man
democlient.c
inetdraft.rst
router.c


Trivial merge
IPv6 everywhere: POSIX systems