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
---
 when | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'when')

diff --git a/when b/when
index 3697fc0..42074c7 160000
--- a/when
+++ b/when
@@ -1 +1 @@
-Subproject commit 3697fc000435c9d9377f8329d7641f8f6d8cbfdf
+Subproject commit 42074c715039af32950c3dbcf144e403660d415b
-- 
cgit v1.2.3-70-g09d2