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)
commit582accb4f2ee3a7d50f4b48129be62c2d54fef46
tree6ac01a907f29e4833089919114a1f22657c757d5
parent9ae8cb685e71d4f91d24955791b62e82831e2cdd
parent05ae3dedf17e189a060f55620178350657104ae5
Merge branch 'localfile'
l10n/map/LocalizationMap.mxml
net/systemeD/potlatch2/collections/VectorBackgrounds.as
potlatch2.mxml