Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Identation Fixed

netware/start.c

@@ -35,17 +35,17 @@ int DisposeLibraryData(	void	*data)
 
 int _NonAppStart
 (
-	void			*NLMHandle,
-	void			*errorScreen,
+	void		*NLMHandle,
+	void		*errorScreen,
 	const char	*cmdLine,
 	const char	*loadDirPath,
 	size_t		uninitializedDataLength,
-	void			*NLMFileHandle,
-	int			(*readRoutineP)( int conn, void *fileHandle, size_t offset,
-								size_t nbytes, size_t *bytesRead, void *buffer ),
+	void		*NLMFileHandle,
+	int		(*readRoutineP)( int conn, void *fileHandle, size_t offset,
+			size_t nbytes, size_t *bytesRead, void *buffer ),
 	size_t		customDataOffset,
 	size_t		customDataSize,
-	int			messageCount,
+	int		messageCount,
 	const char	**messages
 )
 {