Merge branch 'bug-1298' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:34:10 +0000 (22:34 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:34:10 +0000 (22:34 +0200)
commit113e61529e3192197203a7acb3a73019fd251de1
tree05f12b5acd2b30d1b6727c7641aa33d5e681aa06
parent3345173b825f1e135b4f4679efc07285f5b10afe
parent4c250123ec16e7c14b06fad3de4313243800a31f
Merge branch 'bug-1298' into release