diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-03-04 13:28:53 -0500 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-03-04 13:28:53 -0500 |
| commit | 9cedb154b487435c54ee7c3386d30a0f8fdea5f6 (patch) | |
| tree | 67ed626462b739e21038dc2ad6de3d64fd79698a /local | |
| parent | 15aaae67d68baf3f65970e38b41a26cb516a085a (diff) | |
| parent | e1f0d9ff396111830dfa16a6249716baba8dfd81 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions