From svnadmin@urchin.earth.li Wed Apr 28 19:06:38 2010
From: svnadmin@urchin.earth.li
To: openguides-commits@lists.openguides.org
Subject: [openguides-commits] r1289 - in website/publish: . includes
Date: Wed, 28 Apr 2010 19:06:37 +0100
Message-ID: <E1O7Bef-0006N9-To@urchin.earth.li>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3835925698899666675=="

--===============3835925698899666675==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: dom
Date: 2010-04-28 19:06:37 +0100 (Wed, 28 Apr 2010)
New Revision: 1289

Modified:
   website/publish/
   website/publish/gone.shtml
   website/publish/includes/cities_list.inc
Log:
merge stuff



Property changes on: website/publish
___________________________________________________________________
Modified: svn:mergeinfo
   - /website/preview:1265-1277,1284-1285
   + /website/preview:1265-1277,1284-1288


Property changes on: website/publish/gone.shtml
___________________________________________________________________
Modified: svn:mergeinfo
   - /website/preview/gone.shtml:1276-1277,1284-1285
   + /website/preview/gone.shtml:1276-1277,1284-1288

Modified: website/publish/includes/cities_list.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- website/publish/includes/cities_list.inc	2010-04-28 18:06:01 UTC (rev 128=
8)
+++ website/publish/includes/cities_list.inc	2010-04-28 18:06:37 UTC (rev 128=
9)
@@ -35,11 +35,12 @@
     <th></th>
   </tr>
   <tr>
-    <td><a href=3D"http://www.justbiit.com/cgi-bin/openguides/">Brussels</a>=
</td>
+    <td><a href=3D"http://bahrain.openguides.org/">Bahrain</a></td>
+    <td><a href=3D"http://cern.openguides.org/">CERN</a></td>
     <td></td>
   </tr>
   <tr>
-    <td><a href=3D"http://cern.openguides.org/">CERN</a></td>
+    <td><a href=3D"http://brussels.openguides.org/">Brussels</a></td>
     <td></td>
   </tr>
=20



--===============3835925698899666675==--