Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/libcxml
authorCarl Hetherington <cth@carlh.net>
Tue, 19 Nov 2013 14:03:29 +0000 (14:03 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 19 Nov 2013 14:03:29 +0000 (14:03 +0000)

Trivial merge