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)
commit5588ea410c3813f94b80ea89eaf8090ad2b572a9
tree36d8ae0bf61d3ce6893393afa8fbd4c605b8e33b
parent3af3f546a519c17b4c2adb55395628ac15bb5897
parentcf15a23c484dfc7eef4d5284eabdf5843c497999
Merge branch 'master' of git://git-annex.branchable.com