Merge branch 'bug-1061' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 21 Jan 2015 22:05:49 +0000 (23:05 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 21 Jan 2015 22:05:49 +0000 (23:05 +0100)
commitd2965b141a3ae891b97a086269759bc94bd4bca6
tree6f3a6329fa990b9454a2643e1dc5aee2871e6383
parentb117b71820fa797f1a983cd72f1930e6a9222eb0
parentc455e886de73ee737ae62d173cdf5f98a27b5004
Merge branch 'bug-1061' into testserver-stable