Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 25 Feb 2014 17:39:25 +0000 (17:39 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 Feb 2014 17:39:25 +0000 (17:39 +0000)
commit58588c485eac7c488a574fe923576f109ec0134e
treea82a2a61cb0ff7bc6981708942ee8e4376a03904
parentd5f0a9d288948bf23cb0f1050596482f7d0403e3
parent075ee0f7766c9c5bdd0ed3957d1cbac91ae11d53
Merge master.