Merge branch 'bug-807' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 13 Jun 2014 07:20:43 +0000 (09:20 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 13 Jun 2014 07:20:43 +0000 (09:20 +0200)
commit6d0f414854b2c1aa1da9ec49889ac9bb3b69b966
tree7162d1c77760fad5c53474d9bf0a0c7e122b2f66
parent2affa9c6e9a1f2a7f68ab5fa306374cd037d6227
parentf25f8af03c96cfcd4dd83a9f3b6ee4181eb3e2c9
Merge branch 'bug-807' into release