Merge branch 'master' of https://github.com/mplus-software/mplus-api-client-php

Conflicts:
	Mplusqapiclient.php

Author: Mplus Software

Mplusqapiclient.php

@@ -1751,6 +1751,11 @@ public function convertMplusDate($timestamp)
       'day' => date('j', $timestamp),
       'mon' => date('n', $timestamp),
       'year' => date('Y', $timestamp),
+      'hour' => date('H', $timestamp),
+      'min' => date('i', $timestamp),
+      'sec' => date('s', $timestamp),
+      'isdst' => false,
+      'timezone' => 0,
       );
   } // END convertMplusDate()
 
@@ -1762,11 +1767,6 @@ public function convertMplusDateTime($timestamp)
       'day' => date('j', $timestamp),
       'mon' => date('n', $timestamp),
       'year' => date('Y', $timestamp),
-      'hour' => date('H', $timestamp),
-      'min' => date('i', $timestamp),
-      'sec' => date('s', $timestamp),
-      'isdst' => false,
-      'timezone' => 0,
       );
   } // END convertMplusDateTime()