Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline

Conflicts:
	db/item_db.txt
	npc/013-3_Cave/barrier.txt

1 files changed, 1 insertions, 1 deletions

diff --git a/npc/015-1_Woodland/barrier.txt b/npc/015-1_Woodland/barrier.txt
index 5cf82848..0ba82ec9 100644
--- a/npc/015-1_Woodland/barrier.txt
+++ b/npc/015-1_Woodland/barrier.txt
@@ -1,7 +1,7 @@
 // This barrier is for checking whether the player went outside after
 // progressing with the cat quest.
 
-015-1.gat,59,32,0	script	#CatOutsideBarrier	127,1,1,{
+015-1.gat,59,32,0	script	#CatOutsideBarrier	0,1,1,{
     set KatzeBeenOutside, 1;
     // No close here, as this doesn't open any client windows
 }