diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-11 16:23:48 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-11 16:23:48 -0800 |
| commit | 7e5c15fa80e23d1fb22744553156bcebad716ae8 (patch) | |
| tree | f20e5854ec1076192ab8bdc2be31b6a2c4bb7efd /local | |
| parent | 04c76fc4e5d711ba38d22ffe201bb93d40126071 (diff) | |
| parent | 116c5f6839adf518e2bfe27ad2899a474899a9a1 (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