bumping node version to >= 0.5.2 for requiring json files
pulled in upstream master changes to simplify merge/pull request
Merge branch 'master' of https://github.com/sequelize/sequelize into basic_function_and_trigger_migrations
Updated number of undone migrations for undone migration test
Fixed typo
Merge pull request #916 from komola/bug/fix-typo

Fixed typo in exception
Fix typo in abstract query generator
Merge branch 'feature/import-relpath' of https://github.com/accerqueira/sequelize into accerqueira-feature/import-relpath
fixed path resolution
relative paths support
Merge branch 'master' into milestones/2.0.0
test master and v2 branch
report the results of builds to the relative irc channel
fixed scoping of validation
formatting
Merge branch 'master' into milestones/2.0.0
added test case for sequelize.import
merge
import with functions
Merge branch 'master' into milestones/2.0.0