]> 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: 4a95a0b 5b6ecef)
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Tue, 7 Feb 2012 15:27:40 +0000 (16:27 +0100)
committerEvan Prodromou <evan@status.net>
Tue, 7 Feb 2012 15:27:40 +0000 (16:27 +0100)

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. :-)