]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Fri, 31 Dec 2010 00:21:45 +0000 (16:21 -0800)
committerEvan Prodromou <evan@status.net>
Fri, 31 Dec 2010 00:21:45 +0000 (16:21 -0800)

Trivial merge