diff options
| author | Evan Prodromou <evan@status.net> | 2010-08-13 14:52:16 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-08-13 14:52:16 -0700 |
| commit | 341b935acc0111bc2bfa69be5687c4e6f255d8ce (patch) | |
| tree | e7d6c8a5945175bedc502a67ad34a4644635b79e /lib | |
| parent | 1dadb8efc04cbb807b2cd8b6291f7c2f64a631dc (diff) | |
| parent | ae696728f5edf8972c68c17ce9ea21f07d44cbed (diff) | |
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions