]> 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>
Sat, 13 Mar 2010 12:36:25 +0000 (06:36 -0600)
committerEvan Prodromou <evan@status.net>
Sat, 13 Mar 2010 12:36:25 +0000 (06:36 -0600)

Trivial merge