Index: trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- trunk/psLib/src/types/psMetadataConfig.c	(revision 22705)
+++ trunk/psLib/src/types/psMetadataConfig.c	(revision 22707)
@@ -821,26 +821,26 @@
         status = 0;
         strValue = getToken (&linePtr, "#", &status, true);
-       
+
         if (!status && strValue) {
-	    // found a directive, what does it say?
-	    if (strcasecmp (strValue, "UPDATE") && strcasecmp (strValue, "RESET")) {
-		psError(PS_ERR_IO, true, _("Invalid directive %s for METADATA or MULTI."), strValue);
-		psFree(strType);
-		psFree(strValue);
-		return false;
-	    }
-
-	    // found a directive, what does it say?
-	    if (!strcasecmp (strValue, "UPDATE")) {
-		// this folder or group is merged with an existing one of the same name
-		flags |= PS_META_UPDATE_FOLDER;
-	    }
-	    if (!strcasecmp (strValue, "RESET")) {
-		// this folder or group replaces an existing one of the same name
-		flags |= PS_META_REPLACE;
-	    }
-	    psFree(strValue);
-	    strValue = NULL;
-	}
+            // found a directive, what does it say?
+            if (strcasecmp (strValue, "UPDATE") && strcasecmp (strValue, "RESET")) {
+                psError(PS_ERR_IO, true, _("Invalid directive %s for METADATA or MULTI."), strValue);
+                psFree(strType);
+                psFree(strValue);
+                return false;
+            }
+
+            // found a directive, what does it say?
+            if (!strcasecmp (strValue, "UPDATE")) {
+                // this folder or group is merged with an existing one of the same name
+                flags |= PS_META_UPDATE_FOLDER;
+            }
+            if (!strcasecmp (strValue, "RESET")) {
+                // this folder or group replaces an existing one of the same name
+                flags |= PS_META_REPLACE;
+            }
+            psFree(strValue);
+            strValue = NULL;
+        }
 
         // Not all lines will have comments, so NULL is ok.
@@ -887,5 +887,5 @@
             return false;
         }
-    } 
+    }
 
 #define PARSE_ADD_CASE(NAME, TYPE, PARSEFUNC) \
@@ -1241,5 +1241,5 @@
         psError(PS_ERR_IO, true, _("failed to parse file '%s'"), filename);
         psFree(md);
-	psFree(file);
+        psFree(file);
         return NULL;
     }
@@ -1516,10 +1516,6 @@
             }
             psString timeStr = psTimeToISO(time);
-            psString timeOutput;
-            timeOutput = psStringNCopy(timeStr, 19);
-            psStringAppend(&content, "%s", timeOutput);
-            psStringAppend(&content, "Z");
+            psStringAppend(&content, "%s", timeStr);
             psFree(timeStr);
-            psFree(timeOutput);
         } else {
             // psTime is a NULL pointer