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

This commit is contained in:
Joey Hess 2012-10-22 15:50:36 -04:00
commit 95f305aa83
2 changed files with 18 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlZvtBCVyJw4O71OPsdwGpVh6iJ1W-xaPc"
nickname="Kilian"
subject="comment 6"
date="2012-10-22T19:44:45Z"
content="""
Yep, with the test build I see the pair request and can respond to it!
Pairing doesn't seem to succeed, but that looks like a different issue. I'll try around some more and report back, probably in a new thread.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.23"
subject="comment 7"
date="2012-10-22T19:49:44Z"
content="""
All right, I'll change the address.
"""]]