Merge branch 'release' into testserver-stable
bug 1010: added and removed some blanks
Merge branch 'bug-1010' into testserver-stable
Merge branch 'testserver-stable' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-devel into testserver-stable
bug 1010: typo fixing
Merge branch 'bug-1010' into testserver-stable
bug 1177: Include functions from wot.inc.php into notary.inc
bug 1177: Port other changes done in wot.inc.php but not notary.inc.php
bug 1177: Do some formatting/indentation work
bug 1177: Update include references from wot.inc.php to link to notary.inc.php
bug 1177: Removing now obsolete wot.inc.php
Merge branch 'bug-1177' into bug-893

Conflicts:
	includes/account.php
bug 893: Fix indentation to make code-flow more obvious
bug 1137: Move extra code from wot.inc.php to notary.inc.php
Merge branch 'bug-1177' into bug-1137

Conflicts:
	includes/notary.inc.php
	includes/wot.inc.php
	www/wot.php
Merge branch 'bug-1137' into testserver-stable

Conflicts:
	www/wot.php
Merge branch 'bug-893' into testserver-stable

Conflicts:
	includes/account.php
bug 1137: Remove duplicated code causing a blnk page
bug 1137: Fix typo in check_date_difference
Merge branch 'bug-1137' into testserver-stable