Merge branch 'master' of git://git-annex.branchable.com
authorPhilip Hands <phil@hands.com>
Sun, 31 Mar 2013 18:14:44 +0000 (19:14 +0100)
committerPhilip Hands <phil@hands.com>
Sun, 31 Mar 2013 18:14:44 +0000 (19:14 +0100)

Trivial merge