Add F-Droid option
Move desktop testing description to desktop section
Merge pull request #319 from UMLAUTaxl/patch-1

Add F-Droid option
Merge pull request #323 from owncloud/testing-description

Move desktop testing description to desktop section
remove conf completely now?!?
Merge pull request #326 from owncloud/confcleanup

remove conf completely now?!?
Update client to 1.6.4
Merge pull request #329 from owncloud/1_6_4_client

Update client to 1.6.4
1.6.4: fix mac build number
Merge branch 'master' into live