Merge branch 'bug-977' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:42:58 +0000 (18:42 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:42:58 +0000 (18:42 +0100)
commit06b1d82f7de4f515f1ca9985bd7201f3658022a8
tree8dc6e76d47a99eeca02086f7da336bc52520f607
parentfb0e466bf8805b6972af15f9d38f51a0f45e38de
parente1aa7c811eb931546e295cae5c700e0853a4fde0
Merge branch 'bug-977' into release