Tomek Mrugalski f73452e8ea [master] Merge branch 'trac3464' (pool definitions are now structures) ...

Conflicts:
	ChangeLog
	doc/examples/kea4/several-subnets.json
	doc/examples/kea4/single-subnet.json
	doc/examples/kea6/several-subnets.json
	doc/guide/dhcp4-srv.xml

2014-08-08 19:13:38 +02:00

..

several-subnets.json

[master] Merge branch 'trac3464' (pool definitions are now structures)

2014-08-08 19:13:38 +02:00

simple.json

[3427] Changes after review

2014-08-08 11:42:12 +02:00