]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Tue, 1 Jun 2010 20:51:41 +0000 (13:51 -0700)
committerEvan Prodromou <evan@status.net>
Tue, 1 Jun 2010 20:51:41 +0000 (13:51 -0700)

Trivial merge