Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 01:47:12 +0000 (02:47 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 01:47:12 +0000 (02:47 +0100)
commite59d438b2b860b8c1a88fba7f6309301d7fe2072
tree234535b893986eab40efbeb5b14e0eb1ed46eed5
parente793d97b355fa8616fed1b63bd90e865456e0e61
parentba8c4e2885571be2473b75f9d479dc57adea7ed8
Merge branch 'bug-1354' into testserver-stable