Merge remote-tracking branch 'origin/xorg/maint' into xorg/master

diff --git a/banana b/banana
index 9bd9df1..a48027e 160000 (submodule)
--- a/banana
+++ b/banana
@@ -1 +1 @@
-Subproject commit 9bd9df1eace08648ddf2616d3008631f2b697474
+Subproject commit a48027e640560bcdf5767fc6262b3556f87cac5d

diff --git a/include/emails.combobox.inc.php b/include/emails.combobox.inc.php
index db6979b..969d22a 100644 (file)
--- a/include/emails.combobox.inc.php
+++ b/include/emails.combobox.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-function fill_email_combobox(PlPage& $page, $user = null, $profile = null)
+function fill_email_combobox(PlPage $page, $user = null, $profile = null)
 {
     global $globals;