Merge branch 'master' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Fri, 3 Jan 2014 17:32:01 +0000 (17:32 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 3 Jan 2014 17:32:01 +0000 (17:32 +0000)
commitf0e95aa5b7ada81a1c40f06facab2e94e45ab26c
tree8c96cefcbb4bd6d587629f08998f105206c7c5c3
parentc3362d7b12e425fa9549579be10e708c88d5feea
parent30621d42f26991c84fff56a5e79dd9e19f657c7d
Merge branch 'master' into 1.0-seek