]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'locshunt2' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 4 Jan 2010 21:59:56 +0000 (11:59 -1000)
committerEvan Prodromou <evan@status.net>
Mon, 4 Jan 2010 21:59:56 +0000 (11:59 -1000)

Trivial merge