diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2010-07-17 16:32:21 (GMT) |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2010-07-17 16:32:21 (GMT) |
commit | aed5831eb1a7936b75bd0643be9b8698c18c5f2c (patch) | |
tree | d58a9d0e64c4b92193c61de0a9503f7c75ac3c49 /activity/activity.info | |
parent | 40785c4402d3a787092458f96681443e6dd9d67a (diff) | |
parent | f474d3a180f7dc81a373b399e0372e9794825f0e (diff) |
Merge branch 'marcelo'
Diffstat (limited to 'activity/activity.info')
0 files changed, 0 insertions, 0 deletions