]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 15:32:37 +0000 (11:32 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 15:32:37 +0000 (11:32 -0400)

Trivial merge