Merged default into minor

--HG--
branch : minor

src/modules/window/wrap_Window.cpp

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2014 LOVE Development Team
+ * Copyright (c) 2006-2015 LOVE Development Team
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -392,6 +392,12 @@ int w_minimize(lua_State* /*L*/)
 	return 0;
 }
 
+int w_maximize(lua_State *)
+{
+	instance()->maximize();
+	return 0;
+}
+
 int w_showMessageBox(lua_State *L)
 {
 	Window::MessageBoxData data = {};