Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 10:45:24 +0000 (10:45 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 10:45:24 +0000 (10:45 +0000)
commite0c59417c6a52dbd853114fbc0f88c6d8c1dd276
tree5a115a2ac16150b73b9054467b82e2e42c384c9a
parent2d69b8e42c2c69980c214212923fd985a4362cff
parent03b54137dc7b35594a38f5d2bbe702d3876544f7
Merge branch '1.0' into 1.0-seek