Merge branch 'master' into 103-Extension_Group_API

Makefile

@@ -49,6 +49,7 @@ UPGRADABLE = \
   0.9.4 \
   0.10.0 \
   0.10.1 \
+  0.10.2 \
   0.11.0 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \

NEWS.md

@@ -5,6 +5,10 @@ next (2015-mm-dd)
 -------------------
 * Groups API
 
+0.10.2 (2015-09-24)
+-------------------
+* Add back the `DROP FUNCTION IF EXISTS CDB_UserTables(text);` to be able to upgrade from `0.7.3` upward [#160](https://github.com/CartoDB/cartodb-postgresql/issues/160)
+
 0.10.1 (2015-09-16)
 -------------------
 * Get back the `update_updated_at` function (still used by old tables) [#143](https://github.com/CartoDB/cartodb-postgresql/pull/143)

scripts-available/CDB_UserTables.sql

@@ -5,6 +5,7 @@
 --
 -- Currently accepted permissions are: 'public', 'private' or 'all'
 --
+DROP FUNCTION IF EXISTS CDB_UserTables(text);
 CREATE OR REPLACE FUNCTION CDB_UserTables(perm text DEFAULT 'all')
 RETURNS SETOF name
 AS $$