Merge branch '1.0-alt-loop' into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 19 Jul 2013 12:47:34 +0000 (13:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 19 Jul 2013 12:47:34 +0000 (13:47 +0100)
commita6d892268ccdf8e50194c0168491c8a360bbb687
tree80d8007be63f7b9f52bdc46e0171d79454a94597
parent91273da19c689e44f3baa368d4b4efbe75cd8fe5
parent7370f2b159a539d4a7721a50d0f3dc56ba14c678
Merge branch '1.0-alt-loop' into 1.0