Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joey@kitenet.net>
Sun, 31 Mar 2013 23:15:14 +0000 (19:15 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 31 Mar 2013 23:15:14 +0000 (19:15 -0400)
commit358f303c51106dab9ecb4d4b2e5c556af8fab311
tree1e13c03f2957a99aead1fb9faeeae6a67d1c9cd9
parent1b66611ecc13475b1699f073317ed46636851912
parentf080a8e8a0ab20720f49626843d1e39534e56f4d
Merge branch 'master' of ssh://git-annex.branchable.com