summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-12-02 19:35:57 +0100
committerSarven Capadisli <csarven@status.net>2009-12-02 19:35:57 +0100
commit5f0c6f3eaabe0faa40b6d76e158e77d1cd707c8c (patch)
treee6c3aadb3f83f88b089cd12a2bb16d95974053cd /local
parent68f83211a5b5173fbf6a0e7153f4a1b8ca079584 (diff)
parent4205d25d226ed7bfd42ff13035ea208aa3cb1ce6 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions