Merge pull request #3792 from Luke265/master

Bug fix: #3266 - belongsToMany junction table timestamp

Conflicts:
	lib/associations/mixin.js

lib/associations/mixin.js

@@ -291,8 +291,9 @@ Mixin.belongsToMany = function(targetModel, options) { // testhint options:none
   options = options || {};
   options = options || {};
   options.hooks = options.hooks === undefined ? false : Boolean(options.hooks);
   options.hooks = options.hooks === undefined ? false : Boolean(options.hooks);
   options.useHooks = options.hooks;
   options.useHooks = options.hooks;
+  options.timestamps = options.timestamps === undefined ? this.sequelize.options.timestamps : options.timestamps;
 
 
-  options = _.extend(options, _.omit(sourceModel.options, ['hooks']));
+  options = _.extend(options, _.omit(sourceModel.options, ['hooks', 'timestamps']));
 
 
   // the id is in the foreign table or in a connecting table
   // the id is in the foreign table or in a connecting table
   var association = new BelongsToMany(sourceModel, targetModel, options);
   var association = new BelongsToMany(sourceModel, targetModel, options);