Merge branch 'bug-512' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 04:03:11 +0000 (05:03 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 04:03:11 +0000 (05:03 +0100)
commitaba34728a556c0e83658b91bf425d9e9d3d7af81
tree9ad1fb27bd7de557343351c5adb10ae7d147925d
parent82dbce519b4a3abab2c2b2bd714ceb248542b941
parent95f5aeb888e4ce1b9e66db3462fd23ad280a7e8d
Merge branch 'bug-512' into release