Joey Hess cbca93cf7c Merge branch 'master' into assistant ... Conflicts: debian/changelog		2012-08-16 16:36:32 -07:00
..
assistant	Merge branch 'master' into assistant	2012-08-16 16:36:32 -07:00
encryption	Added a comment	2012-08-15 19:16:10 +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