Merge remote-tracking branch 'origin/bug-985' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 24 Jan 2012 11:49:47 +0000 (12:49 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 24 Jan 2012 11:49:47 +0000 (12:49 +0100)
1  2 
www/wot.php

diff --cc www/wot.php
Simple merge