diff options
author | Sarven Capadisli <csarven@status.net> | 2010-03-03 22:58:28 -0500 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-03-03 22:58:28 -0500 |
commit | 239750aa0001b0b1ea5076f6f71ed6ffbb433c31 (patch) | |
tree | efc9a842df9238dd1b6fc81a88a6d5cdac9e8c73 /local | |
parent | de687d00c0ebe8bf5d185b7037df7f1edfd368a3 (diff) | |
parent | 24835c1164251e48037f6ddee14e4b696fe57320 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions