]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac2238'
authorTomek Mrugalski <tomasz@isc.org>
Mon, 1 Oct 2012 13:26:00 +0000 (15:26 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 1 Oct 2012 13:26:00 +0000 (15:26 +0200)
commit09e793e3c71fbbc12f8f8461ceafbabc2edcbc9e
tree7b6afeb56cb6888b59f1f0b8cf281d4f0a9d00c1
parente5bf564f734555173b5cae04757bc3f870f3463a
parent6f29861b92742da34be9ae76968e82222b5bfd7d
[master] Merge branch 'trac2238'

Conflicts:
ChangeLog
ChangeLog