Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Sun, 31 Mar 2013 23:51:33 +0000 (19:51 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 31 Mar 2013 23:51:33 +0000 (19:51 -0400)
commit5e3c43f7fc21d40f6376d76f85951e67b94dfdb7
tree7919f40314ba271fe8bebdd36cfa3e49f130337d
parentcb9b060f4a4c36e4cbbd08c4215d9ba5530a7e09
parentce964b48a457d38e0bfbd9c6b99e9e359284b260
Merge branch 'master' of ssh://git-annex.branchable.com