]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 2 Aug 2011 17:13:10 +0000 (13:13 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 2 Aug 2011 17:13:10 +0000 (13:13 -0400)

Trivial merge