]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Fri, 22 Jan 2010 23:03:48 +0000 (18:03 -0500)
committerCraig Andrews <candrews@integralblue.com>
Fri, 22 Jan 2010 23:03:48 +0000 (18:03 -0500)

Trivial merge