From: Evan Prodromou <evan@status.net>
Date: Wed, 30 Dec 2009 18:57:39 +0000 (-1000)
Subject: Merge branch 'locshunt2' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ad8ea98cd72855f61c71945b533331b6f30d04b6;p=quix0rs-gnu-social.git

Merge branch 'locshunt2' into 0.9.x

Conflicts:
	classes/User_location_prefs.php
---

ad8ea98cd72855f61c71945b533331b6f30d04b6