]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of /home/ian/public_html/statusnet-enhancements
authorIan Denhardt <ian@zenhack.net>
Fri, 13 Aug 2010 18:48:58 +0000 (14:48 -0400)
committerIan Denhardt <ian@zenhack.net>
Fri, 13 Aug 2010 18:48:58 +0000 (14:48 -0400)

Trivial merge