bug 893: domaincerts has no column memid, it has to be referenced via domains

Signed-off-by: Michael Tänzer <neo@nhng.de>
Merge branch 'bug-893' into merge-bug-1177-893-1136-1123-1137
bug 1137: mysql_real_escape() fields in user_agreements although they usually are not
user provided, just to be sure

Signed-off-by: Michael Tänzer <neo@nhng.de>
bug 1137: setting the "certify" check box should depend on the method selected not on
whether one is TTP Assurer

Signed-off-by: Michael Tänzer <neo@nhng.de>
bug 1137: get rid of the board flag, which has already been removed in the release
branch but somehow this change got lost in this branch (during merge conflict resolution)

Signed-off-by: Michael Tänzer <neo@nhng.de>
Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
Revert "bug 1123: fixed merge conflicts on testserver"

This reverts commit 75693292de2d907bf2a4b0f12abd7cd68781f95a.
Merge branch 'release' into bug-1123

Conflicts:
	includes/account.php
	pages/account/10.php
	pages/account/3.php
	pages/gpg/0.php
	www/gpg.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137

Conflicts:
	pages/account/10.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
Change proposed during review
Replaced "Trusted 3rd Parties" by "Trusted Third Parties", "Trusted 3rd Parties" is not documented
bug 1177: Remove unused function

Signed-off-by: Michael Tänzer <neo@nhng.de>
bug 1137: Revert patch from Ted, because of inconsistencies. Also fix a typo in the comment above