]> 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>
Sun, 17 Apr 2011 21:00:54 +0000 (17:00 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 17 Apr 2011 21:00:54 +0000 (17:00 -0400)

Trivial merge