Merge remote-tracking branch 'origin/master'

Johannes · Johannes · commit 65207b9cee10 · 2012-06-23T16:21:08.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,4 +4,4 @@ node_js:
   - 0.6
 
 script:
-  - mocha
+  - npm test
diff --git a/LICENSE b/LICENSE
@@ -15,4 +15,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-Original file line number
+Diff line change
   - 0.6
 script:
 -  - mocha
 +  - npm test