]> 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: 9dc9c40 1e8707d)
Merge commit 'refs/merge-requests/117' of git://gitorious.org/statusnet/mainline...
authorEric Helgeson <erichelgeson@gmail.com>
Sat, 16 Jan 2010 22:42:53 +0000 (17:42 -0500)
committerEric Helgeson <erichelgeson@gmail.com>
Sat, 16 Jan 2010 22:42:53 +0000 (17:42 -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. :-)