summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-22 14:18:21 -0500
committerEvan Prodromou <evan@status.net>2010-01-22 14:18:21 -0500
commit29d83c8ca94201cb010b5aef564df78ab868ea0c (patch)
tree8bc66e2fc03865e287a4c1907e766d6b4311c832 /README
parent104d300799c0817bdbe893f08fd9b46d37a75a80 (diff)
parent0e852def6ae5aa529cca0aef1187152fb5a880be (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions