TAXIIProject/libtaxii — pull request #8 by MarkDavidson (2013-06-26 18:32:11+00:00)
Title: Proxy dev

Merge the proxy_dev branch into master