]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of gitorious.org:statusnet/mainline into 0.8.x
authorCraig Andrews <candrews@integralblue.com>
Tue, 15 Sep 2009 21:09:47 +0000 (17:09 -0400)
committerCraig Andrews <candrews@integralblue.com>
Tue, 15 Sep 2009 21:09:47 +0000 (17:09 -0400)

Trivial merge