Merge branch '1.0' into 1.0-multiple-selection
authorCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 21:55:23 +0000 (21:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 21:55:23 +0000 (21:55 +0000)
commitfbf1af9b5d14ce6a71ea184339ca7c30ed544167
tree3725c5531fe5a9f4054f014f3a7938a11bf69ae1
parent1415214ff18e05e5b609aab8c4efb89e5b9e0cc0
parent8429cf630b45c70b859f57a91e90892269606e75
Merge branch '1.0' into 1.0-multiple-selection