Merge branch 'bug-1304' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 20:26:23 +0000 (22:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 20:26:23 +0000 (22:26 +0200)
commit696c90a202132c93fbe2c03a44ca6e0c4e7527cd
tree201ea7d17ae83c9e6c6532984a04bd9017f2722f
parent3b8168b5e75e1a337823972035b987a66f46134a
parent7c1804cb62705362264cc6577f454f8571ac0c6e
Merge branch 'bug-1304' into testserver-stable