Merge branch 'bug-1302' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 22:34:46 +0000 (23:34 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 22:34:46 +0000 (23:34 +0100)
commit9dec201a033ed64709e69b4e435ee7937dd21f32
treec031bfaa6c55c210f114f959c07c21c8f89d61b5
parent55a5d9d3ef49b51620154de77653367042b0c959
parentad1529515d813353f4c5219e5ebc870e2ae464eb
Merge branch 'bug-1302' into testserver-stable