diff options
author | Joey Hess <joey@kitenet.net> | 2012-09-11 11:49:33 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-09-11 11:49:33 -0400 |
commit | 91edb58d326e59a34c0457c3ea619a1a7953f54f (patch) | |
tree | c49412d6b57bb61ff2efefa5fa5f9d645d941070 /Assistant/Pairing.hs | |
parent | 084dc188c700c1ff7c0ce5db86715b2ece5bf6f2 (diff) | |
parent | ee804c2ee1616799ba2d56919174debf37e27c0f (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'Assistant/Pairing.hs')
0 files changed, 0 insertions, 0 deletions