Joey Hess 0b1cf3a766 Merge branch 'master' into xmpp ... Conflicts: Assistant/Threads/MountWatcher.hs Assistant/Threads/NetWatcher.hs		2012-10-26 00:10:41 -04:00
..
assistant	Merge branch 'master' into xmpp	2012-10-26 00:10:41 -04:00
encryption	Added a comment	2012-08-15 19:16:10 +00:00
assistant.mdwn	add xmpp page	2012-10-24 20:05:45 -04:00
encryption.mdwn	fix link	2012-05-23 19:37:22 -04:00