]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Fri, 11 Feb 2011 21:01:57 +0000 (16:01 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 11 Feb 2011 21:01:57 +0000 (16:01 -0500)

Trivial merge