Merge remote-tracking branch 'origin/master' into compose_focus

Kyle Francis

2016-04-02 65225262f6bb524b93feb49178509cada3390ee3

 plugins/enigma/enigma.php

@@ -352,7 +352,7 @@
                    'value' => 1,
            ));

            $p['blocks']['main']['options']['enigma_encrypt_all'] = array(
            $p['blocks']['main']['options']['enigma_attach_pubkey'] = array(
                'title'   => html::label($field_id, $this->gettext('attachpubkeydefault')),
                'content' => $input->show($this->rc->config->get('enigma_attach_pubkey') ? 1 : 0),
            );