Merge remote-tracking branch 'origin/master'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 4 Oct 2012 07:55:49 +0000 (08:55 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 4 Oct 2012 07:55:49 +0000 (08:55 +0100)
commit778e2a5a91a12a827f283dd267ab1cfbf211734e
tree5f2fb4dd5488ed45cce0d9d344dac61f7f68835c
parent9fafead23d5a8f66ea65c36b450017b10cf8b5fb
parente296f5c824321d5c12be3121d8159fe6a248c3fc
Merge remote-tracking branch 'origin/master'