diff options
author | Evan Prodromou <evan@status.net> | 2010-01-29 15:16:24 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-29 15:16:24 -0500 |
commit | ab3e90949ff5865780c909a0dd957ae2343f7e85 (patch) | |
tree | 540a646a3ab7258699ef0ac8f91645d25df0ec5d /local | |
parent | a7b2a08c42347d7beac43980a673b434a9c0331a (diff) | |
parent | f6c8b8a8680d99afe37accf8eda29e6660bf69ff (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions