Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 15:48:34 +0000 (16:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 15:48:34 +0000 (16:48 +0100)
commit78ae9a1909db6e59aa990db060e9e5c8c580482b
treeec9c5a6cf08ae3fcff57e9a622da6e86142676a5
parentbeac03175fbad7c850a20ee0c7c362e835d8b7b3
parentfea74301948e42bb5fd2853ed84a68a4fb86bbc7
Merge master.
src/cxml.cc
src/cxml.h