]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea
authorTomek Mrugalski <tomasz@isc.org>
Wed, 27 Aug 2014 16:25:54 +0000 (18:25 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Wed, 27 Aug 2014 16:25:54 +0000 (18:25 +0200)
commitd330a5830d76e553ede0753f0ce259765ab5baa7
treed0bdb7f2f8ddbfb58ba9d2f9aa2cf9b4c19ea8c4
parentcc2e668163edcfa75cc133ee79a0807fffe9c656
parentce6e519cab4758542c06aa8e58079cc94f21f6f1
[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

Conflicts:
ChangeLog
ChangeLog