]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
authorIan Denhardt <ian@zenhack.net>
Fri, 13 Aug 2010 22:01:33 +0000 (18:01 -0400)
committerIan Denhardt <ian@zenhack.net>
Fri, 13 Aug 2010 22:01:33 +0000 (18:01 -0400)

Trivial merge