Doug Bell e60c6fdc91 Merge remote branch 'spunky/rfe620' ... Conflicts: docs/changelog/7.x.x.txt docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg		2010-04-19 17:25:30 -05:00
..
English	Merge remote branch 'spunky/rfe620'	2010-04-19 17:25:30 -05:00
_language.skeleton
English.pm