Author: bob Date: 2012-05-23 21:10:08 +0100 (Wed, 23 May 2012) New Revision: 1410

Modified: trunk/ trunk/Changes trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: merge in 0.68 release branch

Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/rel_0_66:1319-1327 /branches/rel_0_67:1391-1394 + /branches/rel_0_66:1319-1327 /branches/rel_0_67:1391-1394 /branches/rel_0_68:1406-1409

Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-21 20:45:57 UTC (rev 1409) +++ trunk/Changes 2012-05-23 20:10:08 UTC (rev 1410) @@ -3,7 +3,7 @@ More detailed changelogs can be found at http://dev.openguides.org/log/trunk.

-0.68 ? +0.68 21 May 2012 Made sure that maps are centred and zoomed properly even when they only contain one point. Made preferences default to never expiring.

Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-05-21 20:45:57 UTC (rev 1409) +++ trunk/lib/OpenGuides.pm 2012-05-23 20:10:08 UTC (rev 1410) @@ -14,7 +14,7 @@

use vars qw( $VERSION );

-$VERSION = '0.67'; +$VERSION = '0.68';

=head1 NAME

Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2012-05-21 20:45:57 UTC (rev 1409) +++ trunk/wiki.cgi 2012-05-23 20:10:08 UTC (rev 1410) @@ -4,7 +4,7 @@ use warnings; use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); -$VERSION = '0.67'; +$VERSION = '0.68';

use CGI qw/:standard/; use CGI::Carp qw(croak);