Merge branch 'release' into bug-1121 bug-1121
authorMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:19:39 +0000 (01:19 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:19:39 +0000 (01:19 +0200)
commitbb07ff8c3a73e4846ef37aa8ddf4c6b195c4af89
tree45df8c724ef05cbc426cd0253a363c901f061a27
parent23310b1c22f1e10de70ebb7f72ac6dcd49b5829d
parent4527af1ecc920d65101fa3326eeabc3c1106ad31
Merge branch 'release' into bug-1121

Conflicts:
www/wot.php
www/index.php
www/wot.php