Merge branch 'master' of git.carlh.net:git/libcxml
authorCarl Hetherington <cth@carlh.net>
Mon, 31 Oct 2016 16:03:57 +0000 (16:03 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 31 Oct 2016 16:03:57 +0000 (16:03 +0000)

Trivial merge