merge

--HG-- branch : trunk
2009-11-03 14:54:40 +01:00
parent de9551b648
commit 3512a1b316
2 changed files with 6 additions and 0 deletions
@@ -0,0 +1,2 @@
+UPDATE `trinity_string` SET `content_default`='Warning: You''ve entered a no-fly zone and are about to be dismounted!' WHERE entry=816;
+
				`@@ -0,0 +1,2 @@`
				UPDATE `trinity_string` SET `content_default`='Warning: You''ve entered a no-fly zone and are about to be dismounted!' WHERE entry=816;