Merge remote branch 'origin/xorg/maint' into xorg/master

diff --git a/ChangeLog b/ChangeLog
index 5f77a84..5fd4551 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 ================================================================================
+VERSION 1.1.1                                                         XX XX XXXX
+
+From 1.1.0 branch:
+
+    * Search:
+        - #1449: Load json2 on IE because IE<=7 do not implement JSON      -FRU
+
+================================================================================
 VERSION 1.1.0                                                         26 03 2011
 
 New:

diff --git a/core b/core
index 23947d1..8dd67de 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 23947d18803b48cc6c235cdd3c304ca52fd6763c
+Subproject commit 8dd67de33d8b729b3ff0f5aae6de1dbad9f3f30d

diff --git a/upgrade/1.1.1/01_languages.sql b/upgrade/1.1.1/01_languages.sql
new file mode 100644 (file)
index 0000000..b6529a7
--- /dev/null
+++ b/upgrade/1.1.1/01_languages.sql
@@ -0,0 +1,8 @@
+-- Updates serbian iso code.
+UPDATE  profile_langskills
+   SET  lid = 'srp'
+ WHERE  lid = 'scc';
+DELETE FROM  profile_langskill_enum
+      WHERE  iso_639_2b = 'scc';
+
+-- vim:set syntax=mysql:

diff --git a/upgrade/1.1.1/connect.db.inc.php b/upgrade/1.1.1/connect.db.inc.php
new file mode 120000 (symlink)
index 0000000..442fab7
--- /dev/null
+++ b/upgrade/1.1.1/connect.db.inc.php
@@ -0,0 +1 @@
+../../bin/connect.db.inc.php
\ No newline at end of file