summaryrefslogtreecommitdiff
path: root/f1c
diff options
context:
space:
mode:
authorArquivo Publico de Memoria Coletiva <arquivo@sarava.org>2015-08-01 19:51:39 -0300
committerArquivo Publico de Memoria Coletiva <arquivo@sarava.org>2015-08-01 19:51:39 -0300
commit442154797e83400e6097bae09ae18efe68d482b0 (patch)
treebdddfe99bf7f549d2dfccd60452b121cf4e9dec7 /f1c
parentf40774d24bb12c30fe17f2470bd6a44a1e8e07da (diff)
parent04532689941d9a7a93ff586e14f178a22500a901 (diff)
parentadf6fd264c6f2736e7ca9915a7dcd8a3b39cf3df (diff)
downloadarquivo-442154797e83400e6097bae09ae18efe68d482b0.tar.gz
arquivo-442154797e83400e6097bae09ae18efe68d482b0.tar.bz2
merging synced/git-annex origin/git-annex into git-annex