Merge branch 'master' into 2.1.x

Conflicts: lib/sprockets/caching.rb
sstephenson · Oct 5, 2011 · b5817f6 · b5817f6
2 parents 07c3208 + 9483f5d
commit b5817f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/sprockets/caching.rb b/lib/sprockets/caching.rb
@@ -20,7 +20,7 @@ def cache_asset(path)
           hash = {}
           asset.encode_with(hash)
 
-          # Save the asset to at its path
+          # Save the asset to its path
           cache_set_hash(path.to_s, hash)
 
           # Since path maybe a logical or full pathname, save the