projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86e3cbb ae3eaee)
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Wed, 17 Oct 2012 14:10:12 +0000 (10:10 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 17 Oct 2012 14:10:12 +0000 (10:10 -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. :-)