summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-02 11:07:57 -0500
committerEvan Prodromou <evan@status.net>2009-12-02 11:07:57 -0500
commit4205d25d226ed7bfd42ff13035ea208aa3cb1ce6 (patch)
tree1d2cc44421a2aff3414d3951033cfd159782b10c /local
parentba4fd15abd2978439118ed167cbaa4973548b68c (diff)
parent14eeef4ac49e5f8c49446c1ac20654d6300ce00b (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