diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
| commit | 87b8a89aa7b96e63586bdd3b1afb9d43355fd48b (patch) | |
| tree | ef227ad50cd25699d34dd1a3364ac0cf430443da /local | |
| parent | a39a934dd4a133bad6e76fa9a5018cedcb70225c (diff) | |
| parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions