Merge branch 'bug-1182' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:32:00 +0000 (22:32 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:32:00 +0000 (22:32 +0200)
commit027e4712332f850848104e93ad9c955a328138c7
tree006a5262e59c56a7a96aa19c93e26699320a6b58
parentb46ec1ee22d739bf0c839d4bb8696e54ea6d03ef
parent2d47d038edcc10b2c119f0f2e135fa9c16c634e4
Merge branch 'bug-1182' into release