Merge branch 'bug-1302' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 22:45:22 +0000 (23:45 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Dec 2014 22:45:22 +0000 (23:45 +0100)
commit5ddd497f2cd0af7a8fcecf5e0ed462fcbed8e302
tree59910bb765230f577d0e555fb44ad2e682df12a4
parent38de2f68a35426b0179d32ed8916e1582b6fe009
parente9922fd0fe3c85f3f35e9d1b3f7d9a7e74a3d7fe
Merge branch 'bug-1302' into testserver-stable