Merge branch '1.0' into 1.0-multiple-selection
authorCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 10:38:01 +0000 (10:38 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 10:38:01 +0000 (10:38 +0000)
commitdeafd62ea410aa23b6b4c87989e8bc7e95db46e3
treec9d36c9b4ed71bd1a7fdf16bc1beebbc1ca3a855
parentd1db495ddf466c47f635ac78eec9229ecfa24722
parentdc2357286638ad9d158737c5e77e5a19532f57e0
Merge branch '1.0' into 1.0-multiple-selection