Merge branch '1.0' into 1.0-generated-control
authorCarl Hetherington <cth@carlh.net>
Thu, 28 Nov 2013 23:20:32 +0000 (23:20 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 28 Nov 2013 23:20:32 +0000 (23:20 +0000)
commit747fc9e02cb66fb965e23a4cc0464cf7e8bd743d
treef4bf137a75c387ca3f69b18db5799fa755ad50b0
parentd5382fd7db3ba0f2ad75ab5879de1b33ac65751c
parent659a80afd870d4432540fe76d6b5a919437d4cca
Merge branch '1.0' into 1.0-generated-control