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 =================================================================== --- website/publish/includes/cities_list.inc 2010-04-28 18:06:01 UTC (rev 1288) +++ website/publish/includes/cities_list.inc 2010-04-28 18:06:37 UTC (rev 1289) @@ -35,11 +35,12 @@ <th></th> </tr> <tr> - <td><a href="http://www.justbiit.com/cgi-bin/openguides/">Brussels</a></td> + <td><a href="http://bahrain.openguides.org/">Bahrain</a></td> + <td><a href="http://cern.openguides.org/">CERN</a></td> <td></td> </tr> <tr> - <td><a href="http://cern.openguides.org/">CERN</a></td> + <td><a href="http://brussels.openguides.org/">Brussels</a></td> <td></td> </tr>