Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 20:48:34 +0000 (20:48 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 20:48:34 +0000 (20:48 +0000)
commitde68adffc0311511568484e9ab713bee8826ec2d
tree05c7e4fc260653a2e5f4c3e5e1bd7c3c823ffb95
parentad10aea1d685e67e0e639f6303fc9c8f8f1f945c
parentf53ef1bb81f5afd81f95bd187f4cd90bbbd3cd7d
Merge branch '1.0' into 1.0-seek