diff options
author | Ted Gould <ted@gould.cx> | 2010-03-12 17:33:49 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-03-12 17:33:49 -0600 |
commit | 62a79745a976eb7459a9f3aaeb9f6fa7e021897f (patch) | |
tree | 79e6c7778a6d8a247bc0a661b61f10b5970a1ee8 /data | |
parent | 44d2e3243736990ca867eba36f4371252e2adf11 (diff) | |
parent | eaf244dd1022818c3780b138497c79ff51bf0a54 (diff) | |
download | ayatana-indicator-session-62a79745a976eb7459a9f3aaeb9f6fa7e021897f.tar.gz ayatana-indicator-session-62a79745a976eb7459a9f3aaeb9f6fa7e021897f.tar.bz2 ayatana-indicator-session-62a79745a976eb7459a9f3aaeb9f6fa7e021897f.zip |
Merging to trunk to remove merge conflicts.
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions