Merge branch 'master' of git://git-annex.branchable.com
authorRichard Hartmann <richih.mailinglist@gmail.com>
Fri, 29 Mar 2013 15:22:10 +0000 (16:22 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Fri, 29 Mar 2013 15:22:10 +0000 (16:22 +0100)

Trivial merge