Merge branch 'bug-1112' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 20:41:26 +0000 (22:41 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 20:41:26 +0000 (22:41 +0200)
commit55a75d23ce0bb2d63ce05f22725f637d2ed35d62
tree2b427fc5b2836180a0540d662ac2d21745103a52
parentceb333fa0d4494fe161760e76c63787287819a2a
parent7b29aa39a788c978bbecbb32e936773c6eb7997d
Merge branch 'bug-1112' into release
includes/wot.inc.php
www/wot.php