Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 4 insertions, 2 deletions

diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index df2f0e32..6ac54360 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -417,9 +417,11 @@ class PostgresUpdater extends DatabaseUpdater {
 			array( 'addPgField', 'templatelinks', 'tl_from_namespace', 'INTEGER NOT NULL DEFAULT 0' ),
 			array( 'addPgField', 'imagelinks', 'il_from_namespace', 'INTEGER NOT NULL DEFAULT 0' ),
 
-			// 1.24.1 (backport from 1.25)
+			// 1.25
+			array( 'dropTable', 'hitcounter' ),
+			array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ),
+			array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ),
 			array( 'dropFkey', 'recentchanges', 'rc_cur_id' )
-
 		);
 	}