Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/libcxml
authorCarl Hetherington <cth@carlh.net>
Sun, 25 Aug 2013 10:05:32 +0000 (11:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 25 Aug 2013 10:05:32 +0000 (11:05 +0100)

Trivial merge