Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Fri, 29 Mar 2013 22:06:54 +0000 (18:06 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 29 Mar 2013 22:06:54 +0000 (18:06 -0400)
commit331b968caee68ef83f493cf752768843a15c4c4e
treee5ac3f22e49ab4a9dd6972d3b70acb568eb2dd86
parentf72677906cde6079b3103f07a8eb6153d771fdbc
parentd99368eaa98170196deffdb5c65790de21d4fed1
Merge branch 'master' of ssh://git-annex.branchable.com