Merge branch 'master' of https://github.com/Rouche/fullcalendar.git

tasks/locale.js

@@ -72,7 +72,7 @@ gulp.task('locale:each:data', function() {
 	return gulp.src('node_modules/moment/locale/*.js')
 		.pipe(modify({
 			fileModifier: function(file, momentContent) {
-				var localeCode = file.path.match(/([^\/]*)\.js$/)[1];
+				var localeCode = file.path.match(/([^\/\\]*)\.js$/)[1];
 				var js = getLocaleJs(localeCode, momentContent);
 
 				if (js) {
@@ -183,7 +183,7 @@ function extractMomentLocaleJS(js) {
 
 	// remove the UMD wrap
 	js = js.replace(
-		/\(\s*function[\S\s]*?function\s*\(\s*moment\s*\)\s*\{([\S\s]*)\}\)\);?/,
+		/\(\s*function[\S\s]*?function\s*\(\s*moment\s*\)\s*\{([\S\s]*)\}\)\)\)?;?/,
 		function(m0, body) {
 			return body;
 		}