Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 21 May 2013 11:51:43 +0000 (12:51 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 21 May 2013 11:51:43 +0000 (12:51 +0100)
commitdc6713f19bb9084aac18eabe399b14ca1ac26df9
tree8c6591d7dbc10c54c672869dd4ec8bb64aeb8c39
parent83742c7e6edcf958e0820abc77c029f4ada4880f
parent47e6b6725168213f2a7db24c2965cfa173f755b4
Merge master.