Merge branch 'bug-1266' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:07:55 +0000 (23:07 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:07:55 +0000 (23:07 +0200)
commitcf0497dcead22ffb3d341aca60a730c61931e9ef
tree38e576c68905427aeaae6a77fe86aa4cc0cbd9bb
parent7edae081657bd29b34caa998e4fbfddf7be3ea8d
parentb349807bb4ec25357262654c461cf42a3be06581
Merge branch 'bug-1266' into release