]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 20:29:58 +0000 (16:29 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 20:29:58 +0000 (16:29 -0400)

Trivial merge