Merge branch 'bug-1053' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 18:43:16 +0000 (20:43 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 18:43:16 +0000 (20:43 +0200)
commitcdca646992a618c9063c912af12997ef1d0695a5
tree62b68ccd2d678bb08110deb6839e0df734109095
parent547015437883dc49038ac42e25bde7d94446de53
parenta33a127a7a89309e426593414ee633338be2517c
Merge branch 'bug-1053' into bug-1042