Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Wed, 2 Nov 2011 16:34:07 +0000 (16:34 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Wed, 2 Nov 2011 16:34:07 +0000 (16:34 +0000)
commit7b30e4368c432881da2cc5ea877f9f25de140210
treefd9068a3d1d952ffd9330f589abbaac118729913
parent710d453582f386bd76a3355617ac019561cb2039
parente4a9407a51803016bab9918b03e2034981886bdb
Merge remote-tracking branch 'origin/master' into 0.11