summaryrefslogtreecommitdiff
path: root/background
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-04 13:46:05 -0500
committerEvan Prodromou <evan@status.net>2010-03-04 13:46:05 -0500
commit1e55266afaccc5c39bba62fc2a712e1fed43a38a (patch)
treef789692515e99a980dbddbf83f0197f417b98019 /background
parent1b49e9d278038bc59fab48072cb9d192ebb4bdbd (diff)
parent0736493f46922674ecef41d73519207b03145fc7 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'background')
0 files changed, 0 insertions, 0 deletions