Joey Hess ef01ff1e77 Merge branch 'master' into s3-aws ... Conflicts: git-annex.cabal		2014-08-15 17:30:40 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	Merge branch 'master' into s3-aws	2014-08-15 17:30:40 -04:00
compat
control	Merge branch 'master' into s3-aws	2014-08-15 17:30:40 -04:00
copyright	update for ddar special remote	2014-05-15 16:37:46 -04:00
doc-base
menu	fixups	2013-05-15 22:48:27 -04:00
NEWS	prep release	2013-10-02 16:13:45 -04:00
rules	re-enable test suite	2013-12-30 14:39:29 -04:00