]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/1815' of git://gitorious.org/statusnet/mainline...
authorCraig Andrews <candrews@integralblue.com>
Fri, 23 Oct 2009 15:15:25 +0000 (11:15 -0400)
committerCraig Andrews <candrews@integralblue.com>
Fri, 23 Oct 2009 15:15:25 +0000 (11:15 -0400)

Trivial merge