]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 153208a 53274a6)
Merge branch 'master' of git://gitorious.org/laconica/CiaranG into ciarang/master
authorEvan Prodromou <git@evanprodromou.name>
Fri, 30 Jan 2009 16:28:05 +0000 (11:28 -0500)
committerEvan Prodromou <git@evanprodromou.name>
Fri, 30 Jan 2009 16:28:05 +0000 (11:28 -0500)

Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)