Merge branch 'master' into milestones/2.0.0

.travis.yml

@@ -10,6 +10,8 @@ notifications:
     - sascha@depold.com
     - sascha@depold.com
   hipchat:
   hipchat:
     - 40e8850aaba9854ac4c9963bd33f8b@253477
     - 40e8850aaba9854ac4c9963bd33f8b@253477
+  irc:
+    - "chat.freenode.net#sequelizejs"
 
 
 env:
 env:
   - DB=mysql DIALECT=mysql
   - DB=mysql DIALECT=mysql
@@ -22,3 +24,8 @@ language: node_js
 node_js:
 node_js:
   - "0.8"
   - "0.8"
   - "0.10"
   - "0.10"
+
+branches:
+  only:
+    - master
+    - milestones/2.0.0

test/dao.validations.test.js

@@ -276,15 +276,16 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
         })
         })
 
 
         User.sync({ force: true }).success(function() {
         User.sync({ force: true }).success(function() {
-          User.create({username: 'bob', email: 'hello@world.com'}).success(function(user) {
-            User.update({username: 'toni'}, {id: user.id})
-            .error(function(err) { console.log(err) })
-            .success(function() {
-              User.find(1).success(function(user) {
-                expect(user.username).to.equal('toni')
-                done()
+          User.create({ username: 'bob', email: 'hello@world.com' }).success(function(user) {
+            User
+              .update({ username: 'toni' }, { id: user.id })
+              .error(function(err) { console.log(err) })
+              .success(function() {
+                User.find(1).success(function(user) {
+                  expect(user.username).to.equal('toni')
+                  done()
+                })
               })
               })
-            })
           })
           })
         })
         })
       })
       })