Joey Hess d6f65aed16 Merge branch 'master' into assistant ... Conflicts: doc/design/assistant/syncing.mdwn		2012-07-06 18:26:40 -06:00
..
assistant	Merge branch 'master' into assistant	2012-07-06 18:26:40 -06:00
encryption	Added a comment	2011-04-07 19:59:30 +00:00
assistant.mdwn	move	2012-06-04 15:42:26 -04:00
encryption.mdwn	fix link	2012-05-23 19:37:22 -04:00