]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '2429' into 0.9.x
authorJames Walker <walkah@walkah.net>
Mon, 2 Aug 2010 20:45:23 +0000 (16:45 -0400)
committerJames Walker <walkah@walkah.net>
Mon, 2 Aug 2010 20:45:23 +0000 (16:45 -0400)

Trivial merge