Alexandre Dulaunoy 882a7221b5 Merge branch 'master' of github.com:adulau/pdns-qof ... Conflicts: i-d/pdns-qof.txt		2013-12-25 19:55:18 +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.xml	add privacy section	2013-12-25 19:54:20 +01:00