Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2012-11-12 10:43:50 -04:00
commit 59aff16e02

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.27"
subject="comment 6"
date="2012-11-12T14:43:32Z"
content="""
For local pairing, multicast UDP is used for discovery and authentication, and then all data transfers take place over ssh.
"""]]