]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3575' (doc update for host reservation)
authorTomek Mrugalski <tomasz@isc.org>
Sun, 15 Feb 2015 21:37:45 +0000 (22:37 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Sun, 15 Feb 2015 21:37:45 +0000 (22:37 +0100)
commita981e42eb0f39d27795364a6862b3a5e574e540a
treeb871d8afd0c114831290d9ca4eea6f2b637aa0ca
parent2090b64332b05e0bc50f768dfcde93ca20616add
parenta6a25b1693d0ba44736223a69f0326e51f308baa
[master] Merge branch 'trac3575' (doc update for host reservation)

Conflicts:
doc/Makefile.am
doc/Makefile.am
doc/guide/dhcp4-srv.xml
doc/guide/dhcp6-srv.xml