]> 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>
Fri, 13 Aug 2010 21:52:16 +0000 (14:52 -0700)
committerEvan Prodromou <evan@status.net>
Fri, 13 Aug 2010 21:52:16 +0000 (14:52 -0700)

Trivial merge