activate
Merge branch 'master' of file:///media/Village/preseed/seed/.sync/.canvas
annex-20140503161744
annex-20140503175950