Raul Ochoa f96c80d7a1 Merge branch 'master' into standalone-server ... Conflicts: lib/cartodb/cartodb_windshaft.js		2015-09-08 15:42:30 +02:00
..
cartodb	Merge branch 'master' into standalone-server	2015-09-08 15:42:30 +02:00