Merge branch 'bug-1291' into release
authorBenny Baumann <BenBE@geshi.org>
Sat, 9 Aug 2014 08:56:14 +0000 (10:56 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 9 Aug 2014 08:56:14 +0000 (10:56 +0200)
commit3641ed05c58e2f350bc33cef737a0c35755364eb
tree4eda8e492e7566d9f3618c87cd3dae35a07b9059
parentfa3a17789986431c15dac26c43a8100ee7e8d0d4
parentb2f8a5d29ed0d35b53e71efc11ff7db1ce4308ae
Merge branch 'bug-1291' into release