Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 27 Nov 2011 23:33:45 +0000 (23:33 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 27 Nov 2011 23:33:45 +0000 (23:33 +0000)
commit025ce3e6ca6b15b25996b8ab9d3e73353b99ee4e
tree449c699116c8647a924c3e7d1586720ac53d57b2
parent77361e2919c5c09494908dc8d74599dce1aaacc5
parent98b9d602c1b7c9a4c7bed083f6549c481570caa7
Merge remote-tracking branch 'origin/master' into 0.11