Merge branch 'master' into 'master'

Marius Cramer

2015-08-23 eb1177f61b0299bb011ffc1180e0d3c7fc1e87fc

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