]> 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: 061c8d9 dc41e3d)
Merge commit 'refs/merge-requests/153' of git://gitorious.org/statusnet/mainline...
authorZach Copley <zach@status.net>
Tue, 1 Mar 2011 00:36:59 +0000 (16:36 -0800)
committerZach Copley <zach@status.net>
Tue, 1 Mar 2011 00:36:59 +0000 (16:36 -0800)

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