Merge branch 'release' into bug-1137
authorMichael Tänzer <neo@nhng.de>
Tue, 24 Sep 2013 21:57:26 +0000 (23:57 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 24 Sep 2013 21:57:26 +0000 (23:57 +0200)
1  2 
www/wot.php

diff --cc www/wot.php
Simple merge