Merge branch 'master' into 'master'

Marius Cramer

2015-03-06 39a2d33c4680fe0a0fcd10e864d075f520d9905e

 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();