Fixed merge

readme.txt

@@ -43,6 +43,12 @@ GLM 0.9.3.0: 2011-XX-XX
 - Added extension versioning
 - Removed many unused namespaces
 
+================================================================================
+GLM 0.9.2.5: 2011-09-2X
+--------------------------------------------------------------------------------
+- Fixed floatBitToXint functions
+- Fixed pack and unpack functions
+
 ================================================================================
 GLM 0.9.2.4: 2011-09-03
 --------------------------------------------------------------------------------