]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'locshunt2' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 30 Dec 2009 18:57:39 +0000 (08:57 -1000)
committerEvan Prodromou <evan@status.net>
Wed, 30 Dec 2009 18:57:39 +0000 (08:57 -1000)
commitad8ea98cd72855f61c71945b533331b6f30d04b6
treeb258b4be986595b75dfc8e180c3bdec4155906f6
parenta1b130541b75d774faee663e3ab1c5c9044a5849
parent544e884d30618224c317931c031175c0f6319849
Merge branch 'locshunt2' into 0.9.x

Conflicts:
classes/User_location_prefs.php