Merge branch 'localfile'
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:24:09 +0000 (16:24 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 15:24:09 +0000 (16:24 +0100)
1  2 
l10n/map/LocalizationMap.mxml
net/systemeD/potlatch2/collections/VectorBackgrounds.as
potlatch2.mxml

Simple merge
diff --cc potlatch2.mxml
Simple merge