Merge branch 'bug-411' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 23 Oct 2013 17:48:36 +0000 (19:48 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 23 Oct 2013 17:48:36 +0000 (19:48 +0200)
commit234b43aca01ba78b9aff492591f84187ca12a664
tree08f6140ed0b68e91d55167f3f6bdd9f9bf78987a
parent837b2b59f77a68afe7bebeecac381a0190a5ab3c
parentdf55d38af2e9c613d1392611314b249995c3d971
Merge branch 'bug-411' into release