Merge branch 'bug-1345' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 16:43:10 +0000 (17:43 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 16:43:10 +0000 (17:43 +0100)
commit00ae63b22b97efbe5702bf346b3d87d0353cd09d
tree0bd3108b4ec4f6527063fffc317d1e716ca5aa7e
parente18bdfeac8e0d6f6082e7fb3d3ef32bf61fd457e
parent0ee3b4ad3aabb00beb3f128ab1ee1bf2da84bee5
Merge branch 'bug-1345' into release