summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-13 17:30:22 -0800
committerEvan Prodromou <evan@status.net>2010-01-13 17:30:22 -0800
commitfba840ed568222b082dbac81cd8e38217d53a7ec (patch)
treec806515e53b4ee63210d53ac5372e4e610d8bd6e /local
parent52bbb2262a6030f811e8adeaf5e177228f66351c (diff)
parent82e57b620453033cde487d95e4def27089425155 (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