Joey Hess f7847ae98d Merge branch 'master' into s3-aws ... Conflicts: Utility/Url.hs debian/changelog git-annex.cabal		2014-09-18 14:36:20 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	add: In direct mode, adding an annex symlink will check it into git, as was already done in indirect mode.	2014-09-18 14:24:47 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	Merge branch 'master' into s3-aws	2014-09-18 14:36:20 -04:00
copyright	update for ddar special remote	2014-05-15 16:37:46 -04:00
doc-base	Add doc-base file. Closes: #621408	2011-04-06 21:57:22 -04:00
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