Merge branch 'bug-795' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 03:17:53 +0000 (04:17 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 03:17:53 +0000 (04:17 +0100)
commit82dbce519b4a3abab2c2b2bd714ceb248542b941
treefdf649b88a4047481ba60c3f6d39a94df7e64c19
parentedf7b3cf0e846188d6c606dabeac9c3b4e4b71bf
parent2b28585e5f4f56f4766ac144d3470273893a457e
Merge branch 'bug-795' into release
pages/account/40.php
pages/index/11.php