Merge branch 'bug-1002' into release
authorMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:33:12 +0000 (00:33 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:33:12 +0000 (00:33 +0200)
1  2 
www/wot.php

diff --cc www/wot.php
Simple merge