Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 8 Jul 2014 08:13:48 +0000 (09:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 8 Jul 2014 08:13:48 +0000 (09:13 +0100)
commit73f52e94953848c696725defd3d7f5c4c30707e2
tree5e197a2ff473c333e8eb93cd06451809ec4fe1bb
parent1555c48eda3def5f7ece413a47f0c7ff94dd70dd
parent0f20f8f31a5699f5afada954cd421a7701497298
Merge master.
ChangeLog