Merge branch 'bug-1131' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 21:02:17 +0000 (22:02 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Dec 2014 21:02:17 +0000 (22:02 +0100)
commite18bdfeac8e0d6f6082e7fb3d3ef32bf61fd457e
tree3c8bcc1e070b4c15825758e16b4a426a58cf1fe0
parent5596d4a37845019c6053c184a94689101a7d48a8
parent0988a0c268653910f78a50e16d34edf14a89dc13
Merge branch 'bug-1131' into release