Merge branch 'zerkms-master' into 2.0.2-wip

author Mark Otto <markotto@twitter.com>

Mon, 12 Mar 2012 00:38:23 +0000 (17:38 -0700)

committer Mark Otto <markotto@twitter.com>

Mon, 12 Mar 2012 00:38:23 +0000 (17:38 -0700)
author Mark Otto <markotto@twitter.com>
Mon, 12 Mar 2012 00:38:23 +0000 (17:38 -0700)
committer Mark Otto <markotto@twitter.com>
Mon, 12 Mar 2012 00:38:23 +0000 (17:38 -0700)
diff --cc Makefile

index 92afa1578ed364e82239755351c61a7bad7723f4,6979d70b18e24c7a2a471f79e2a587fd88f6221f..768d59e1f3387d5c0cbd251e42fe5be1d3a433e7
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -59,4 -55,4 +58,4 @@@ watch
         watchr -e "watch('less/.*\.less') { system 'make' }"
   
   
- .PHONY: docs watch gh-pages
- -.PHONY: dist docs watch gh-pages
++.PHONY: docs watch gh-pages
author	Mark Otto <markotto@twitter.com>
	Mon, 12 Mar 2012 00:38:23 +0000 (17:38 -0700)
committer	Mark Otto <markotto@twitter.com>
	Mon, 12 Mar 2012 00:38:23 +0000 (17:38 -0700)