Joey Hess 03979d4d54 Merge branch 'master' into assistant ... Conflicts: Makefile		2012-07-25 14:55:53 -04:00
..
assistant	Merge branch 'master' into assistant	2012-07-25 14:55:53 -04:00
encryption	Added a comment	2011-04-07 19:59:30 +00:00
assistant.mdwn	link	2012-07-20 16:37:30 -04:00
encryption.mdwn	fix link	2012-05-23 19:37:22 -04:00