projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8277060 94b524d)
Merge commit 'refs/merge-requests/174' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Wed, 28 Sep 2011 20:14:42 +0000 (16:14 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 28 Sep 2011 20:14:42 +0000 (16:14 -0400)

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