Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Jul 2013 22:38:25 +0000 (23:38 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Jul 2013 22:38:25 +0000 (23:38 +0100)
commit483008f6509dd1a2f0409335521339195cdf8f4d
tree7ca12f410c2f9a7b276d1a68cc1205e1669e54d7
parentb9b9cd71b6390052474d5812ab5b7540f16ac5a2
parent94b593bc13271ee955d8811e6b60741369c41c66
Merge master.
ChangeLog