fixed rebase conflicts bug-794
authorBernhard Fröhlich <bernhard@cacert.org>
Thu, 5 Jan 2012 16:30:51 +0000 (17:30 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Thu, 5 Jan 2012 16:30:51 +0000 (17:30 +0100)
commite314789474070c09bf1d392743705a567f222585
treec6f1f95c85a930bc3e1ec902188feb0ab630e1bf
parent833fa287d843e0eae01c11f50f041b6ed7101b96
parent7df3644ad3525db4591585ac1736f2d6722c8c97
fixed rebase conflicts
pages/account/43.php