Merge branch 'bug-1133' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 03:04:52 +0000 (04:04 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 03:04:52 +0000 (04:04 +0100)
1  2 
www/wot.php

diff --cc www/wot.php
Simple merge