summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-19 10:59:14 -0700
committerBrion Vibber <brion@pobox.com>2010-05-19 10:59:14 -0700
commita39a934dd4a133bad6e76fa9a5018cedcb70225c (patch)
treef82b4248da5447780df322c35ca041956bcd887e /local
parentd0ba34e0f32ac71b552302ec875943e0e9236720 (diff)
parent74a89b1fc37067d91d31bd66922053361eb4e616 (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions