summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-03 19:52:28 -0500
committerSarven Capadisli <csarven@status.net>2010-03-03 19:52:28 -0500
commit0994589b7389caa609f9b93e7c1572463b7dca36 (patch)
tree5e7e71df492aa09cbacca44232c7479f12f8ce22 /local
parenta26d23b39515e42a2f5437203d90d583d9a1be89 (diff)
parent61de37ec7bfb620288d3bc3b1fcdfb66725f0f99 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions