Alexandre Dulaunoy cbe34ce7dd Merge branch 'master' of github.com:adulau/pdns-qof ... Conflicts: i-d/pdns-qof.txt		2013-12-25 18:09:44 +01:00
..
.gitignore	add vim gitignore stuff	2013-12-25 17:32:53 +01:00
Makefile	add html output option	2013-12-25 15:43:30 +01:00
pdns-qof.txt	and make a new version of the txt	2013-12-25 17:52:15 +01:00
pdns-qof.xml	hsterns' email address is still a problem	2013-12-25 17:56:24 +01:00