diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-11-18 17:04:42 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-11-18 17:04:42 -0500 |
commit | cac5a417f2a81b974781d4dbc40fd9d718a7a7f2 (patch) | |
tree | ac4798b1acd4abbe1674af08af99460374bda537 /local | |
parent | a00141a180d54cbcc244e0157c72f53ac53779b3 (diff) | |
parent | 199ccdb53fbd732eeced3edf734e39687729da9b (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions