Merge branch 'release' into bug-985 bug-985
authorMichael Tänzer <neo@nhng.de>
Tue, 10 Jan 2012 12:32:37 +0000 (13:32 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 10 Jan 2012 12:32:37 +0000 (13:32 +0100)
commit923efbdb9d77f2976d2eb6584a1bb922c0cfaf90
treeef816048edfdf64d07d33e4e5d55653db8ebdb00
parentffeed4b555aa9c0088c43d1dbfbd810d3b177c01
parent22fb084237713f5041def5161a2df884b1b24f74
Merge branch 'release' into bug-985

Conflicts:
www/wot.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
includes/account.php
includes/general.php
includes/general_stuff.php
pages/wot/5.php
www/index.php
www/wot.php