Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 20:21:59 +0000 (22:21 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 20:21:59 +0000 (22:21 +0200)
commit6b5b8453d250a0ec96724b4da5b2f907d3a22512
tree0d497b9b18130ff3cbe4b4b9f395ca069ae56d44
parent6df5cec76f53a0edc54567ea7cc0a65f14712927
parentb5d6b4b5c7d3b46767d9141970952c420c67f885
Merge branch 'bug-1131' into testserver-stable