diff options
| author | Wade Brainerd <wadetb@gmail.com> | 2009-02-21 03:29:07 (GMT) |
|---|---|---|
| committer | Wade Brainerd <wadetb@gmail.com> | 2009-02-21 03:29:07 (GMT) |
| commit | f9d2c5f7476d7002a30e4677815de5a9b2ea6776 (patch) | |
| tree | a8b8c9f56e8f6316ceb51b5da21f2735dd48384c /activity/activity.info | |
| parent | 60695c0699b8388a104893cf2e78325aee41c847 (diff) | |
| parent | 6d3ea3c552f121322b2de90c985ec2e21591d4e5 (diff) | |
Merge commit 'origin/master' into sucrose-0.82sucrose-0.82
Conflicts:
po/fr.po
po/it.po
Diffstat (limited to 'activity/activity.info')
0 files changed, 0 insertions, 0 deletions