Joey Hess 8a8380f1b7 use sync command merge engine in assistant ... To handle direct mode merging.		2012-12-25 14:10:07 -04:00
..
assistant	use sync command merge engine in assistant	2012-12-25 14:10:07 -04:00
encryption	Added a comment	2012-08-15 19:16:10 +00:00
assistant.mdwn	update	2012-12-10 16:11:38 -04:00
encryption.mdwn	fix link	2012-05-23 19:37:22 -04:00