]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into activityatompub
authorEvan Prodromou <evan@status.net>
Thu, 9 Dec 2010 16:27:55 +0000 (11:27 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 9 Dec 2010 16:27:55 +0000 (11:27 -0500)

Trivial merge