Merge branch 'bug-929' into release
authorBenny Baumann <BenBE@geshi.org>
Sat, 7 Jun 2014 08:07:53 +0000 (10:07 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 7 Jun 2014 08:07:53 +0000 (10:07 +0200)
commit2affa9c6e9a1f2a7f68ab5fa306374cd037d6227
tree594aa86a97bafc4e2fb83a523a8fff07b63e9b3f
parentb2fd61f3c4117c510124a62bc133228136899524
parent3378a4e9196a2c6485e548ac34e7e383b47be7f1
Merge branch 'bug-929' into release