Merge branch 'bug-1159' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 21 Apr 2013 21:16:56 +0000 (23:16 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 21 Apr 2013 21:16:56 +0000 (23:16 +0200)
commitadec6700f7b359f1b8a60d341fb9f0170de7b3bf
tree70eb9cace08d1a1c443e61003b33a56fe651b92c
parent55a75d23ce0bb2d63ce05f22725f637d2ed35d62
parenta3d0b8aa25e24616abfd35e686348b691064f9c7
Merge branch 'bug-1159' into release