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

This commit is contained in:
Joey Hess 2013-12-29 17:33:20 -04:00
commit a0739220f9

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 1"
date="2013-12-29T21:31:49Z"
content="""
Yeah, I have patched haskell network library to not do anything for NODELAY on Android, but I have to re-bootstrap my entire haskell dev environment due to that change. With luck, I will have a fixed build to try in around 16 hours.
"""]]