Merge branch 'master' into 'master'

Marius Cramer

2014-01-28 c1bef897ed1abaf9c5730b339d6de3d950d2f980

 interface/web/mailuser/mail_user_password_edit.php

@@ -52,7 +52,7 @@

   function onSubmit() {

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

      parent::onSubmit();