Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Jan 2014 18:17:59 +0000 (18:17 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Jan 2014 18:17:59 +0000 (18:17 +0000)
commitd2926ea8574330b9c7f4efa4241843cf052652b8
treeb56f612cf69ce9be907c1157c58dc606ac1d0615
parentb9567ce4b9212c3ed386592d318eea0e639472c0
parent7dedacfb85b10cdf0f5697ea1d0fe8cc5cf8379e
Merge branch '1.0' into 1.0-seek