summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-04 10:41:25 -0800
committerBrion Vibber <brion@pobox.com>2010-03-04 10:41:25 -0800
commit4d3f90ed1993490375866e802f15c219a22c80ca (patch)
tree6409c2919d75831843931c381883e2d38615a003 /local
parent22c06337a07196af5512630f3a8d1ee3ee5e715b (diff)
parent53f390a0748ab9a59cadb1b014abd196ad9d733a (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions