Alejandro Martínez 07fd7619bc Merge remote-tracking branch 'origin/master' into health-check ...

Conflicts:
	NEWS.md
	npm-shrinkwrap.json
	package.json

2015-01-13 11:55:54 +01:00

..

development.js.example

Merge remote-tracking branch 'origin/master' into health-check

2015-01-13 11:55:54 +01:00

production.js.example

Merge remote-tracking branch 'origin/master' into health-check

2015-01-13 11:55:54 +01:00

staging.js.example

Merge remote-tracking branch 'origin/master' into health-check

2015-01-13 11:55:54 +01:00

test.js.example

Merge remote-tracking branch 'origin/master' into health-check

2015-01-13 11:55:54 +01:00