diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-03 14:28:45 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-03 14:28:45 (GMT) |
commit | 131c791f15992ecaf6960ba8d90e0e106468fa5e (patch) | |
tree | 9fa6fff8ac64b8e8e10b258b677a0730e06bb7a6 /activity/activity.info | |
parent | e8549d91315dc9dbdc84c750d39bcc4a477c893e (diff) | |
parent | 9645f7ca8930c7822e3c3a9df264337adb459251 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
Conflicts:
NEWS
Diffstat (limited to 'activity/activity.info')
0 files changed, 0 insertions, 0 deletions