From 1b2bdfa4e00b286ae0eb1e480669ea8387464519 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Mon, 27 Aug 2012 19:44:53 +0200
Subject: [PATCH] Merge fixes from branch v0612maps.

---
 AndorsTrail/res/xml/worldmap.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index 58e40de15..7e394f863 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -180,7 +180,7 @@
  <namedarea id="loneford" name="Loneford" type="settlement"/>
  <namedarea id="flagstone" name="Flagstone Prison" type="other"/>
  <namedarea id="fallhaven" name="Fallhaven" type="settlement"/>
- <namedarea id="fflask" name="Fomaing Flask Tavern" type="other"/>
+ <namedarea id="fflask" name="Foaming Flask Tavern" type="other"/>
  <namedarea id="crossroads" name="Crossroads Guardhouse" type="other"/>
  <namedarea id="remgard" name="Remgard" type="settlement"/>
  <namedarea id="vilegard" name="Vilegard" type="settlement"/>