2 commits

Author	SHA1	Message	Date
Joey Hess	d74f8db808	de-emphasize git annex merge	2011-12-26 14:38:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko	a3e4bf8c16		2011-12-16 09:23:21 +00:00