summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-04 13:29:41 -0500
committerEvan Prodromou <evan@status.net>2010-03-04 13:29:41 -0500
commitffbf8218097fd93397cce7a3317b86d43bb62500 (patch)
treebe928274f2aa47838917a345387b010dc4948ddf /README
parent5bd89d92b1a62b7fab80332acd2ca8ae0f14ee4b (diff)
parent9cedb154b487435c54ee7c3386d30a0f8fdea5f6 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions