Raul Ochoa 5f6185dd51 Merge branch 'master' into 257-remove-old-api ...

Conflicts:
	lib/cartodb/cartodb_windshaft.js
	lib/cartodb/server_options.js
	package.json

2015-03-23 12:24:10 +01:00

..

cartodb

Merge branch 'master' into 257-remove-old-api

2015-03-23 12:24:10 +01:00