diff options
author | Joey Hess <joey@kitenet.net> | 2012-11-09 18:23:40 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-11-09 18:23:40 -0400 |
commit | 82403c8d5352d11a8dc1dac1364f1a8a68051d56 (patch) | |
tree | fd15c24ec049b8a8d14e734d45045fe57f43ff49 /Assistant/XMPP | |
parent | 63e4beb14f1a81adfff687d21065358a94d5627b (diff) | |
parent | 8967f6bfaf735a2968fe65f382d18708c20d1893 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant/XMPP')
0 files changed, 0 insertions, 0 deletions