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)

Trivial merge