Merge branch 'bug-1345' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 6 Jan 2015 21:26:01 +0000 (22:26 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 6 Jan 2015 21:26:01 +0000 (22:26 +0100)
commit03bcce1f880ad647780d00be9eeaadd2fd66d1dc
tree2d01b60d2cfefa140f9ba030ecef8390a6fafbd2
parent0267223199c2dac653216eee63cd9a95048551e8
parent0ee3b4ad3aabb00beb3f128ab1ee1bf2da84bee5
Merge branch 'bug-1345' into testserver-stable