]> 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>
Sat, 9 Apr 2011 19:38:39 +0000 (15:38 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 9 Apr 2011 19:38:39 +0000 (15:38 -0400)

Trivial merge