Merge branch 'bug-1283' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:25:46 +0000 (20:25 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:25:46 +0000 (20:25 +0200)
1  2 
pages/wot/9.php

diff --cc pages/wot/9.php
Simple merge