Merge branch 'bug-1304' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 15 Oct 2014 16:46:50 +0000 (18:46 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 15 Oct 2014 16:46:50 +0000 (18:46 +0200)
commite96fb125dbc8809c048f63ed9034ef975dc32d1f
tree0a1b4a62a02f51e0794d47b42afde6d77062da54
parent696c90a202132c93fbe2c03a44ca6e0c4e7527cd
parentb22298425ce0bc3292281c626876ca0b9d3a306c
Merge branch 'bug-1304' into testserver-stable