Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:18:54 +0000 (23:18 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:18:54 +0000 (23:18 +0200)
commit5bb15e6cf7551adca29d527b4f7c0167b1dff14b
treeebb2404bec076b1d9093ea04bd4c95d067eff2e0
parent5f262af72ff56b6afaef62786f3a7ec3d321766f
parent886211b0f935afa70645329fb00f5ece7a26bee1
Merge branch 'bug-1131' into testserver-stable