Merge branch 'bug-1392' into release
authorBenny Baumann <BenBE@geshi.org>
Sat, 25 Jul 2015 12:56:13 +0000 (14:56 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 25 Jul 2015 12:56:13 +0000 (14:56 +0200)
commit310fd4c54a84cb1e7b8a8a24a6224f15711333f7
treec06ff98cfe5d28a6098a1ded1e8e7dc582e558b6
parent345eb2e771f6475e243f406fe37c41933a520c11
parent69cbc101efa4a568e92d98d97bfc1e0f41d68e41
Merge branch 'bug-1392' into release