Merge branch 'bug-1003' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 21 Oct 2013 21:29:23 +0000 (23:29 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 21 Oct 2013 21:29:23 +0000 (23:29 +0200)
commit837b2b59f77a68afe7bebeecac381a0190a5ab3c
tree463e47723987400d176bb0221a7ea59e79e977f2
parent7c4e99b87fabc51823d06741d0b2c360315f1e7f
parent44873a4e80edd621e4000a88dbdd3741bc704304
Merge branch 'bug-1003' into release