Merge branch '1.9.6.x'

This commit is contained in:
ccd0 2014-10-12 19:50:10 -07:00
commit fc79dcd272

View File

@ -42,7 +42,7 @@
"grunt": "0.4.5",
"grunt-concurrent": "1.0.0",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-coffee": "0.11.1",
"grunt-contrib-coffee": "0.12.0",
"grunt-contrib-compress": "0.12.0",
"grunt-contrib-concat": "0.5.0",
"grunt-contrib-copy": "0.6.0",