Merge branch 'bug-1292' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:30:21 +0000 (22:30 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:30:21 +0000 (22:30 +0200)
commit3345173b825f1e135b4f4679efc07285f5b10afe
treeaf5a467c2d1f184fba8070846eae3ff28050cbed
parentbe3c7c9559e887db82a8a4c5d7c54ec66536fbe6
parentc32626a6e4ef7885ea1e1dcc6b39af07914498a4
Merge branch 'bug-1292' into release