Joey Hess 700d5683a9 Merge branch 'master' into xmpp ... Conflicts: debian/changelog doc/design/assistant/more_cloud_providers.mdwn		2013-05-21 15:54:47 -04:00
..
assistant	Merge branch 'master' into xmpp	2013-05-21 15:54:47 -04:00
encryption	Added a comment	2012-08-15 19:16:10 +00:00
assistant.mdwn	update	2013-05-11 17:19:43 -04:00
encryption.mdwn	Generate ciphers with a better entropy.	2013-04-06 16:09:51 -04:00