Merge branch 'bug-1282' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 22:37:46 +0000 (23:37 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 22:37:46 +0000 (23:37 +0100)
commit38de2f68a35426b0179d32ed8916e1582b6fe009
tree42a372df7bd0a2da92c9316746f00233f1e67c97
parent9dec201a033ed64709e69b4e435ee7937dd21f32
parent1a5c88baf84a80e8fba99cd2393ed00acb54107b
Merge branch 'bug-1282' into testserver-stable