summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-10-25 14:35:56 -0700
committerZach Copley <zach@status.net>2010-10-25 14:35:56 -0700
commit307c819089146a83ae3b8f3c21be692cd6297c19 (patch)
tree4eb85f9d495b80c8dbd596475cfa6a041035a8e2 /README
parent1a1ca22aca8ab0524413fb41e195adab068a2b42 (diff)
parent0243cea82bb41460a1f0bb2ea3c5fef157ec67bb (diff)
Merge commit 'refs/merge-requests/2223' of git://gitorious.org/statusnet/mainline into integration
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions