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)
commit04b2afa7ad27a97dc4add40c8ac85acceb444c9f
tree562bb1a2696b15bb23963c97598c1fffe4273ccb
parent94c2e0f20c4ea472ef9d9c8251ebd787e5646147
parentdc66645cce7052da08d413b06e158899ea9e94d7
Merge branch 'master' of /var/git/6bed4

Conflicts:

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