Merge branch 'bug-1134' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 20:05:43 +0000 (22:05 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 20:05:43 +0000 (22:05 +0200)
1  2 
www/wot.php

diff --cc www/wot.php
Simple merge