Author: bob Date: 2012-07-07 21:47:31 +0100 (Sat, 07 Jul 2012) New Revision: 1427

Modified: trunk/ trunk/Changes trunk/lib/OpenGuides/Utils.pm Log: merge in changes from the 0.69 release branch

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

Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-07-07 20:03:11 UTC (rev 1426) +++ trunk/Changes 2012-07-07 20:47:31 UTC (rev 1427) @@ -3,9 +3,9 @@ More detailed changelogs can be found at http://dev.openguides.org/log/trunk.

-0.69 ? +0.69 07 July 2012 The output of the "show_missing_metadata" action is now alphabetised. - There's also now an option to view the results on a map. + There's also now an option to view the results on a map. (#296 & #294) Fixed a JavaScript escaping issue for nodes with apostrophes in names.

0.68 21 May 2012

Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2012-07-07 20:03:11 UTC (rev 1426) +++ trunk/lib/OpenGuides/Utils.pm 2012-07-07 20:47:31 UTC (rev 1427) @@ -2,7 +2,7 @@

use strict; use vars qw( $VERSION ); -$VERSION = '0.13'; +$VERSION = '0.14';

use Carp qw( croak ); use Wiki::Toolkit;