my bad! encrypted+plaintex+zip
Merge branch 'devel' of github.com:globaleaks/GLClient into devel