]> 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, 6 Feb 2010 10:24:12 +0000 (11:24 +0100)
committerEvan Prodromou <evan@status.net>
Sat, 6 Feb 2010 10:24:12 +0000 (11:24 +0100)

Trivial merge