From: Robin Millette <millette@controlyourself.ca>
Date: Fri, 17 Apr 2009 17:04:05 +0000 (+0000)
Subject: fix merge conflict 0.7.x 0.8.x in util.php and register.php.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e5094c3359fb74caeea474f8e08eb0d15b477652;p=quix0rs-gnu-social.git

fix merge conflict 0.7.x 0.8.x in util.php and register.php.
---

e5094c3359fb74caeea474f8e08eb0d15b477652