From 1d91a7996a5ade0915cd340c5726baa3c0986e04 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Sun, 16 Mar 2014 11:50:06 -0400
Subject: Merge branch 'master' of happinessforme.com:html5ks

Conflicts:
	Makefile
	Modernizr
---
 Modernizr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Modernizr')

diff --git a/Modernizr b/Modernizr
index 1a7d746..7ea2b19 160000
--- a/Modernizr
+++ b/Modernizr
@@ -1 +1 @@
-Subproject commit 1a7d74663f3edf0770a2146b934217fd7a543829
+Subproject commit 7ea2b19a6ad3e97c7649aabe75a823d55be48c99
-- 
cgit v1.2.3-54-g00ecf