Merge branch 'master' of github.com:adulau/pdns-qof

This commit is contained in:
Alexandre Dulaunoy 2013-12-25 18:39:45 +01:00
commit d1d7aab5e2
2 changed files with 3 additions and 3 deletions

View file

@ -2,7 +2,7 @@
TODO TODO
===== =====
* get an updated address of Henry * <del>get an updated address of Henry </del> DONE
* formal grammar (ABNF) for the output format * formal grammar (ABNF) for the output format
* create query API RFC * create query API RFC
* move samples to a separate section * move samples to a separate section

View file

@ -118,8 +118,8 @@
<country>Canada</country> <country>Canada</country>
</postal> </postal>
<phone>+1 408 922 4555</phone> <phone>+1 408 922 4555</phone>
<email>hestern@cisco.com</email> <email>stern@fsi.io</email>
<uri>http://www.cisco.com/security</uri> <uri>https://www.farsightsecurity.com/</uri>
</address> </address>
</author> </author>