branch created
merging synced/git-annex bellmann/git-annex into git-annex
update
merging linode-src/git-annex into git-annex