]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into userflag
authorEvan Prodromou <evan@status.net>
Sat, 7 Nov 2009 18:16:43 +0000 (13:16 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 7 Nov 2009 18:16:43 +0000 (13:16 -0500)

Trivial merge