Merge branch 'bug-1172' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 21:50:49 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 21:50:49 +0000 (23:50 +0200)
commitb2fd61f3c4117c510124a62bc133228136899524
tree382e1fdee1d3fd434bc9f253ce1c4a5c6afff2a7
parent4dd6c64ef0556151b0bfa5f2b452d810e44ab3ac
parent79462a7718d79b8a796aefd018f6d1203229620d
Merge branch 'bug-1172' into release