Merge branch 'master' into 'master'

Marius Cramer

2015-05-22 8684fba8e8b3557a0ee2eee26a128e13e731c7e6

 interface/web/mailuser/mail_user_password_edit.php

@@ -51,7 +51,8 @@
class page_action extends tform_actions {

   function onSubmit() {

      global $app, $conf;
		
      $this->id = $app->functions->intval($_SESSION['s']['user']['mailuser_id']);

      parent::onSubmit();