From: Tim Wood <washwithcare@gmail.com>
Date: Mon, 17 Sep 2012 18:48:03 +0000 (-0700)
Subject: Merging master
X-Git-Tag: 2.0.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5af2ea64f11fc24ca4ed4bc9b9af3e7f817ef8b;p=thirdparty%2Fmoment.git

Merging master
---

a5af2ea64f11fc24ca4ed4bc9b9af3e7f817ef8b
diff --cc CONTRIBUTING.md
index 000000000,b03057614..8cf426fd1
mode 000000,100644..100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -1,0 -1,34 +1,35 @@@
+ Submitting Issues
+ =================
+ 
+ If you are submitting a bug with moment, please create a [jsfiddle](http://jsfiddle.net/) demonstrating the issue.
+ 
+ Contributing
+ ============
+ 
 -To contribute, fork the library and install these npm packages.
++To contribute, fork the library and install grunt.
+ 
 -    npm install jshint uglify-js nodeunit
++    npm install grunt -g
+ 
+ You can add tests to the files in `/test/moment` or add a new test file if you are adding a new feature.
+ 
 -To run the tests, do `make test` to run all tests, `make test-moment` to test the core library, and `make test-lang` to test all the languages.
++To run the tests, do `grunt test` to run all tests.
+ 
 -To check the filesize, you can use `make size`.
++To check the filesize, you can use `grunt size`.
+ 
 -To minify all the files, use `make moment` to minify moment, `make langs` to minify all the lang files, or just `make` to minfy everything.
++To minify all the files, use `grunt release`.
+ 
+ If your code passes the unit tests (including the ones you wrote), submit a pull request.
+ 
+ Submitting pull requests
+ ========================
+ 
+ Moment.js now uses [git-flow](https://github.com/nvie/gitflow). If you're not familiar with git-flow, please read up on it, you'll be glad you did.
+ 
+ When submitting new features, please create a new feature branch using `git flow feature start <name>` and submit the pull request to the `develop` branch.
+ 
+ Pull requests for enhancements for features should be submitted to the `develop` branch as well.
+ 
+ When submitting a bugfix, please check if there is an existing bugfix branch. If the latest stable version is `1.5.0`, the bugfix branch would be `hotfix/1.5.1`. All pull requests for bug fixes should be on a `hotfix` branch, unless the bug fix depends on a new feature.
+ 
+ The `master` branch should always have the latest stable version. When bugfix or minor releases are needed, the develop/hotfix branch will be merged into master and released.
++
diff --cc package.json
index e8e32e687,f4f189cd9..ae99cbd25
--- a/package.json
+++ b/package.json
@@@ -35,12 -35,12 +35,12 @@@
          }
      ],
      "devDependencies" : {
 -        "jshint"    : "latest",
          "uglify-js" : "latest",
 -        "nodeunit"  : "latest"
 +        "nodeunit"  : "latest",
-         "grunt"  : "latest"
++        "grunt"     : "latest"
      },
      "scripts": {
 -        "test": "make test"
 +        "test": "grunt"
      },
      "ender": "./ender.js"
  }