summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-11-17 22:16:08 +0000
committerZach Copley <zach@status.net>2010-11-17 22:16:08 +0000
commit645a4d1754128fdb34e4805ea9aa59f41af8df6f (patch)
tree10336fb9b33aa12b8bffa03d1d93e2b30d6d7b6d /local
parent163f18b8acd59e7343da4bdde9d0a5f5bd762308 (diff)
parent197b56778a04a1d0f12dabb84e95dc9b80902aeb (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