summaryrefslogtreecommitdiff
path: root/background
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-04 10:24:42 -0800
committerBrion Vibber <brion@pobox.com>2010-03-04 10:24:42 -0800
commite1f0d9ff396111830dfa16a6249716baba8dfd81 (patch)
tree04703b29f7146cf5507610cf66d03fafd899849a /background
parent7bd0b8e17ebee9f1b582ac7dd5032562216f9ad0 (diff)
parent1f15e52483366f834ea06e951b077d03f72bfaea (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'background')
0 files changed, 0 insertions, 0 deletions