bug-882 resolved merge conflict ...
authordirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 22:43:07 +0000 (00:43 +0200)
committerdirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 22:43:07 +0000 (00:43 +0200)
commitcdfc30d5a6a677a3b13c3576af2fbd975f447498
tree290ecc91f46eedc84e36ef478af0d9d53597a207
parent32a12f0e40e4bb6fc1bc4d958d88d4df13f0146b
parentc9524ee04d797eedb02a6d329de8960fe5b79bb3
bug-882 resolved merge conflict ...
Merge commit 'origin/bug-882' into bug-882

Conflicts:

includes/notary.inc.php
includes/notary.inc.php
includes/notary.inc1.php