merge 454 closes 454

This commit is contained in:
Scott Davis 2011-07-25 23:05:37 -04:00
parent 38cf0e571b
commit 7a183754b7

View File

@ -7,7 +7,7 @@ GIT
PATH
remote: .
specs:
compass (0.11.3.rails.0.2124003)
compass (0.12.0.alpha.0.38cf0e5)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
@ -105,7 +105,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
rake (0.8.7)
rb-fsevent (0.4.0)
rcov (0.9.9)
rdoc (3.6.1)
@ -147,6 +147,7 @@ DEPENDENCIES
livereload
mocha
rails (~> 3.0.0.rc)
rake (= 0.8.7)
rb-fsevent
rcov
rspec (~> 2.0.0)