Merge branch '0.9.2' into 0.9.3

glm/core/type_mat2x2.hpp

@@ -208,6 +208,16 @@ namespace detail
 		tmat2x2<T> const & m1, 
 		tmat2x2<T> const & m2);
 		
+	template <typename T>
+	tmat3x2<T> operator* (
+		tmat2x2<T> const & m1, 
+		tmat3x2<T> const & m2);
+		
+	template <typename T>
+	tmat4x2<T> operator* (
+		tmat2x2<T> const & m1, 
+		tmat4x2<T> const & m2);
+
 	template <typename T> 
 	tmat2x2<T> operator/ (
 		tmat2x2<T> const & m, 

glm/core/type_mat2x3.hpp

@@ -183,11 +183,21 @@ namespace detail
 		typename tmat2x3<T>::col_type const & v, 
 		tmat2x3<T> const & m);
 
+	template <typename T>
+	tmat2x3<T> operator* (
+		tmat2x3<T> const & m1, 
+		tmat2x2<T> const & m2);
+
 	template <typename T>
 	tmat3x3<T> operator* (
 		tmat2x3<T> const & m1, 
 		tmat3x2<T> const & m2);
 		
+	template <typename T>
+	tmat4x3<T> operator* (
+		tmat2x3<T> const & m1, 
+		tmat4x2<T> const & m2);
+
 	template <typename T> 
 	tmat2x3<T> operator/ (
 		tmat2x3<T> const & m, 

glm/core/type_mat2x4.hpp

@@ -185,10 +185,20 @@ namespace detail
 		typename tmat2x4<T>::col_type const & v, 
 		tmat2x4<T> const & m);
 
+	template <typename T>
+	tmat4x4<T> operator* (
+		tmat2x4<T> const & m1, 
+		tmat4x2<T> const & m2);
+		
 	template <typename T>
 	tmat2x4<T> operator* (
 		tmat2x4<T> const & m1, 
-		tmat2x4<T> const & m2);
+		tmat2x2<T> const & m2);
+		
+	template <typename T>
+	tmat3x4<T> operator* (
+		tmat2x4<T> const & m1, 
+		tmat3x2<T> const & m2);
 
 	template <typename T> 
 	tmat2x4<T> operator/ (

glm/core/type_mat3x2.hpp

@@ -196,6 +196,16 @@ namespace detail
 		tmat3x2<T> const & m1, 
 		tmat2x3<T> const & m2);
 		
+	template <typename T>
+	tmat3x2<T> operator* (
+		tmat3x2<T> const & m1, 
+		tmat3x3<T> const & m2);
+		
+	template <typename T>
+	tmat4x2<T> operator* (
+		tmat3x2<T> const & m1, 
+		tmat4x3<T> const & m2);
+
 	template <typename T> 
 	tmat3x2<T> operator/ (
 		tmat3x2<T> const & m, 

glm/core/type_mat3x3.hpp

@@ -211,6 +211,16 @@ namespace detail
 		tmat3x3<T> const & m1, 
 		tmat3x3<T> const & m2);
 		
+	template <typename T>
+	tmat2x3<T> operator* (
+		tmat3x3<T> const & m1, 
+		tmat2x3<T> const & m2);
+		
+	template <typename T>
+	tmat4x3<T> operator* (
+		tmat3x3<T> const & m1, 
+		tmat4x3<T> const & m2);
+
 	template <typename T> 
 	tmat3x3<T> operator/ (
 		tmat3x3<T> const & m, 

glm/core/type_mat3x4.hpp

@@ -196,6 +196,16 @@ namespace detail
 		tmat3x4<T> const & m1, 
 		tmat4x3<T> const & m2);
 		
+	template <typename T>
+	tmat2x4<T> operator* (
+		tmat3x4<T> const & m1, 
+		tmat2x3<T> const & m2);
+		
+	template <typename T>
+	tmat3x4<T> operator* (
+		tmat3x4<T> const & m1, 
+		tmat3x3<T> const & m2);
+
 	template <typename T> 
 	tmat3x4<T> operator/ (
 		tmat3x4<T> const & m, 

glm/core/type_mat4x2.hpp

@@ -197,8 +197,18 @@ namespace detail
 		tmat4x2<T> const & m);
 
 	template <typename T>
-	tmat2x2<T> operator* (
+	tmat3x2<T> operator* (
 		tmat4x2<T> const & m1, 
+		tmat3x4<T> const & m2);
+		
+	template <typename T>
+	tmat4x2<T> operator* (
+		tmat4x2<T> const & m1, 
+		tmat4x4<T> const & m2);
+		
+	template <typename T>
+	tmat2x3<T> operator* (
+		tmat4x3<T> const & m1, 
 		tmat2x4<T> const & m2);
 
 	template <typename T> 

glm/core/type_mat4x3.hpp

@@ -194,11 +194,21 @@ namespace detail
 		typename tmat4x3<T>::col_type const & v, 
 		tmat4x3<T> const & m);
 
+	template <typename T> 
+	tmat2x3<T> operator* (
+		tmat4x3<T> const & m1, 
+		tmat2x4<T> const & m2);
+
 	template <typename T> 
 	tmat3x3<T> operator* (
 		tmat4x3<T> const & m1, 
 		tmat3x4<T> const & m2);
 		
+	template <typename T>
+	tmat4x3<T> operator* (
+		tmat4x3<T> const & m1, 
+		tmat4x4<T> const & m2);
+
 	template <typename T> 
 	tmat4x3<T> operator/ (
 		tmat4x3<T> const & m, 

glm/core/type_mat4x4.hpp

@@ -209,6 +209,16 @@ namespace detail
 		typename tmat4x4<T>::col_type const & v, 
 		tmat4x4<T> const & m);
 		
+	template <typename T>
+	tmat2x4<T> operator* (
+		tmat4x4<T> const & m1, 
+		tmat2x4<T> const & m2);
+
+	template <typename T>
+	tmat3x4<T> operator* (
+		tmat4x4<T> const & m1, 
+		tmat3x4<T> const & m2);
+
 	template <typename T> 
 	tmat4x4<T> operator* (
 		tmat4x4<T> const & m1,