From: Tim Wood <washwithcare@gmail.com>
Date: Mon, 25 Mar 2013 17:20:03 +0000 (-0700)
Subject: Merge branch 'feature/grunt-0.4' into develop
X-Git-Tag: 2.1.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98cd46aa46f38561ed76bf0a20d3fdc3e9511bf2;p=thirdparty%2Fmoment.git

Merge branch 'feature/grunt-0.4' into develop

* feature/grunt-0.4:
  building with new grunt version
  Upgrading from 1.0 to 2.0 uglify version
  Fixing travis grunt install via http://www.mattgoldspink.co.uk/2013/02/10/using-travis-ci-with-grunt-0-4-x/
  Fix watch plugin
  Fix jshint errors
  Add minwithcomments and minlang into release tasks
  fix zone and zones tasks
  fix minwithcomments task
  fix minlang task
  Add concatlang in release task
  fix concatlang taks
  Update core task to grunt plugin: min task →  grunt-contrib-uglify plugin
  add the grunt-contrib-uglify plugin
  Add grunt-contrib-concat plugin
  Remove nodeunit core task. There is the grunt-contrib-nodeunit plugin instead of it.
  Fix error from jshint: Missing space after 'function'
  update jshint plugin
  upgrade grunt from 0.3 to 0.4 (changed the test and lint plugin)
  import project metadata into the grunt config
  Rename grunt.js to Gruntfile.js
---

98cd46aa46f38561ed76bf0a20d3fdc3e9511bf2