Merge branch 'bug-1047' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:37:06 +0000 (20:37 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:37:06 +0000 (20:37 +0200)
commiteb9580c197838a73ea1ab05cfbe16e54d798f517
tree822515edf55beabea72d78935b2cdffbb8a2b087
parentb69a57b13e92d188ee659ca733b060e374f39918
parent2efff443565132f9dc5bf31c72497189b68422ca
Merge branch 'bug-1047' into bug-1042