From 6c162692401adf2cd9aa47dcb74336dcbddb1324 Mon Sep 17 00:00:00 2001
From: Michael Heimpold <mhei@heimpold.de>
Date: Fri, 21 Aug 2015 22:32:24 +0200
Subject: [PATCH] php5: fix the two different maintainer fields into one (fixes
 #1688)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---
 lang/php5/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index dee218c5a..0be18c684 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=php
 PKG_VERSION:=5.6.12
 PKG_RELEASE:=1
 
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>, Michael Heimpold <mhei@heimpold.de>
 
 PKG_LICENSE:=PHPv3.01
 PKG_LICENSE_FILES:=LICENSE
@@ -55,7 +55,6 @@ define Package/php5/Default
   CATEGORY:=Languages
   TITLE:=PHP5 Hypertext preprocessor
   URL:=http://www.php.net/
-  MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
   DEPENDS:=php5
 endef