aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-07-01 15:36:42 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-07-01 15:36:42 -0500
commit699cfd922662beb924ac8e56220dc2e18f7459ff (patch)
treea0dceeea63de52d3cb4bc623a5971342772841d6 /data
parentc96e42d1d00d68b6c858d7d314c13b4d05ca0d8b (diff)
parentc58fa92fbc37800d340d6eaacb13c4fd42df2857 (diff)
downloadayatana-indicator-session-699cfd922662beb924ac8e56220dc2e18f7459ff.tar.gz
ayatana-indicator-session-699cfd922662beb924ac8e56220dc2e18f7459ff.tar.bz2
ayatana-indicator-session-699cfd922662beb924ac8e56220dc2e18f7459ff.zip
sync with trunk to fix merge conflict
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions