Merge branch 'bug-1190' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 15 Jul 2013 21:19:11 +0000 (23:19 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 15 Jul 2013 21:19:11 +0000 (23:19 +0200)
commit6b57530d2db804487d467dd05f4d5f5abafda033
tree181d1b57cd40274c119c86d2a5a569b25bd3ff20
parent0f787a6c3ce0c6581492422fd7c137ffe546ed83
parentae73936f64df57d277ed3efda12dcb5cad1ddbf1
Merge branch 'bug-1190' into release