Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Thu, 19 Dec 2013 17:49:51 +0000 (17:49 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 19 Dec 2013 17:49:51 +0000 (17:49 +0000)
commitc94f29d333e1b81aabbc396920250844460d46f6
treebed6c667d7085790132d9aecb113b6a025d98347
parent0b2223212b20910717d63d65517b4a8abe5d2bd4
parent8d39a3e4a42b0547acedb8497c4ad4b1d54521f9
Merge branch '1.0' into 1.0-seek