Merge branch 'master' into watch

Conflicts:
	debian/changelog
	git-annex.cabal
This commit is contained in:
Joey Hess 2012-06-12 13:37:17 -04:00
commit 2e5ea30981
9 changed files with 75 additions and 23 deletions

7
doc/contributing.mdwn Normal file
View file

@ -0,0 +1,7 @@
## Style
This project uses tabs for indentation and the code looks fine with
any tab width. If you are using Emacs, and have it configured to use
spaces for indentation, then you can add a `./.dir-locals.el` to use
tabs for files in this project. See
<http://www.emacswiki.org/emacs/DirectoryVariables>.