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)
Conflicts:

includes/wot.inc.php

1  2 
includes/wot.inc.php

Simple merge