Alexander Sulfrian 916895639b Merge remote branch 'upstream/master'
Conflicts:
	lib/query.js
	lib/types.js
	test/unit/client/query-tests.js
	test/unit/client/typed-query-results-tests.js
2011-11-18 21:12:28 +01:00
..
2011-08-29 02:35:08 -05:00
2011-08-11 21:30:10 -05:00