Merge branch 'bug-1345' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Dec 2014 15:49:05 +0000 (16:49 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Dec 2014 15:49:05 +0000 (16:49 +0100)
commit2490a6b12e78296e96b7285c661d221d47c20b72
tree0e9e2a288c381c5d8298436df7f1d6400da0b2a5
parenta9984a1cac4a546c0a9bfa5bb47fb189806955fe
parent0969326c45f2ef3652be99722e576019241d1a23
Merge branch 'bug-1345' into testserver-stable