Merge branch 'bug-1192' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 20:09:42 +0000 (22:09 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 20:09:42 +0000 (22:09 +0200)
commit7a4bc4f99bcdfaafe4d6f509f4e56921b61c8040
tree628c3998dd8f2e8483064dc1558a9f9e32ee5777
parentb6510d1f0c875de07626a8c4f818f0edd9e38e26
parentb90ee5a97dcf351e22f43f26bf971c3f39fcdf85
Merge branch 'bug-1192' into testserver-stable