Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit 6b9ca633f1f9 · 2012-10-24T15:50:27.000-05:00
diff --git a/cookbook/assetic/yuicompressor.rst b/cookbook/assetic/yuicompressor.rst
@@ -157,4 +157,4 @@ apply this filter when debug mode is off.
 
 
 .. _`YUI Compressor`: http://developer.yahoo.com/yui/compressor/
-.. _`Download the JAR`: http://yuilibrary.com/downloads/#yuicompressor
+.. _`Download the JAR`: http://yuilibrary.com/projects/yuicompressor/

Original file line number	Diff line number	Diff line change
`@@ -157,4 +157,4 @@ apply this filter when debug mode is off.`
`157`	`157`
`158`	`158`
`159`	`159`	.. _`YUI Compressor`: http://developer.yahoo.com/yui/compressor/
`160`		-.. _`Download the JAR`: http://yuilibrary.com/downloads/#yuicompressor
	`160`	+.. _`Download the JAR`: http://yuilibrary.com/projects/yuicompressor/