Merge branch '1.0' into 1.0-multiple-selection
authorCarl Hetherington <cth@carlh.net>
Thu, 14 Nov 2013 11:49:13 +0000 (11:49 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 14 Nov 2013 11:49:13 +0000 (11:49 +0000)
commitd99ca0a95e61b53105f765497bc465a7420e7a47
tree58a67cdd855671dab9ffbd287ecb99ff248e4c1b
parente01bcff13a26ebd5158212d8fde57985afe2788e
parentf60d6f84708e2ff568089732cb9fbdbdc8cef3db
Merge branch '1.0' into 1.0-multiple-selection