Merge branch 'bug-1138' of https://github.com/INOPIAE/CAcert into bug-1138
authorINOPIAE <inopiae@cacert.org>
Sun, 8 Dec 2013 17:25:16 +0000 (18:25 +0100)
committerINOPIAE <inopiae@cacert.org>
Sun, 8 Dec 2013 17:25:16 +0000 (18:25 +0100)
commit103de8f1b582298d7352e2395295ca378f0c011f
treedf0c1306847413f06644074b36f43965be4169b5
parentd653cd9cc696bb988a40aa80fb914c5f04b2f39f
parentbbcafda8e9f17cd84b252a45171fd11397f6e27a
Merge branch 'bug-1138' of https://github.com/INOPIAE/CAcert into bug-1138

Conflicts:
includes/account.php
includes/temp_functions.php
pages/account/43.php
includes/account.php
pages/account/43.php