Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 19:49:59 +0000 (19:49 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 19:49:59 +0000 (19:49 +0000)
commit72bcd7b3e204f993fe263acc5395a8928b8936cd
tree02938ea7629bd653ffda7a6c49aec4470d921b7d
parent12043938ef3de7cff4762e76b718c21a3f1dbfc6
parentbb15f1a28b56d86380ed113cab88ed596b1ad452
Merge remote-tracking branch 'origin/master' into 0.11