Merge branch 'bug-1293' into release
authorBenny Baumann <BenBE@geshi.org>
Thu, 28 Aug 2014 07:22:31 +0000 (09:22 +0200)
committerBenny Baumann <BenBE@geshi.org>
Thu, 28 Aug 2014 07:22:31 +0000 (09:22 +0200)
commit7fa0fbd5ca00be480a61499bc8d8ff658ac1895d
tree6b2edb7886e3e1c43a9ed0a73c2c6fc4df47c166
parentf7509bc9a6a2bcc1cae277d159aed71d6a0049c3
parent1e079aba2cf37259a3506026e4b748465f3c6f3a
Merge branch 'bug-1293' into release