diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-25 09:14:42 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-25 09:14:42 -0800 |
| commit | 84fa3776e28ed438169e732327616208c89837e2 (patch) | |
| tree | 59c3ded251375a700be6043703464b32beee5fec /avatar | |
| parent | 99c0e16844460feb42afecb43e0a5fc9e37624af (diff) | |
| parent | a6afc1cfd6e99d83322910d4c1dafb16b1c4ae90 (diff) | |
Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline into integration
Diffstat (limited to 'avatar')
0 files changed, 0 insertions, 0 deletions