]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Thu, 18 Feb 2010 11:36:47 +0000 (06:36 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 18 Feb 2010 11:36:47 +0000 (06:36 -0500)

Trivial merge