Merge commit 'origin/bug-827' into bug-827
authordirk <beliebige_email_adresse@fidocon.de>
Tue, 16 Aug 2011 23:08:00 +0000 (01:08 +0200)
committerdirk <beliebige_email_adresse@fidocon.de>
Tue, 16 Aug 2011 23:08:00 +0000 (01:08 +0200)
commit920872907c76d3e2c21cb6bfe36842af9121a314
treecb9fd048942de76872d093d14157608c1fbe93b6
parent443cafa2003738f9b2d34fdb1cad38528943fc46
parent84c058819acda629c4d3f88350d0cb5f3f24fd38
Merge commit 'origin/bug-827' into bug-827

Conflicts:

includes/wot.inc.php
includes/wot.inc.php