]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'dcostalis/econversation' into 0.8.x
authorCraig Andrews <candrews@integralblue.com>
Mon, 10 Aug 2009 17:20:56 +0000 (13:20 -0400)
committerCraig Andrews <candrews@integralblue.com>
Mon, 10 Aug 2009 17:20:56 +0000 (13:20 -0400)

Trivial merge