jos 349e9845e8 Merge branch 'develop' into v2_merge ...

Conflicts:
	HISTORY.md
	bower.json
	component.json
	dist/math.js
	dist/math.map
	dist/math.min.js
	docs/reference/units.md
	lib/version.js
	package.json
	test/function/construction/chain.test.js
	test/function/matrix/det.test.js
	test/function/matrix/transpose.test.js
	test/function/utils/import.test.js

2015-04-13 21:42:43 +02:00

..

to.test.js

Merge branch 'develop' into v2_merge

2015-04-13 21:42:43 +02:00