Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:58 +0000 (23:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:58 +0000 (23:20 +0000)
commitf585848d4b2612dda10a9840605afcd1489b83db
treef82382a707aac01cac058680694b9f92318a1871
parentc5fea3f93c40e562621cae8934d511c0d5772c92
parent9eb79984a88d7eac96806c8b9999f16fa90c80a6
Merge remote-tracking branch 'origin/master' into 0.11
ext/kate/gstkatetiger.c