From 341ef7175af7c8f21d27262b58da8f5bc2c06ef0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:44:59 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'

---
 install/sql/incremental/upd_0034.sql |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/install/sql/incremental/upd_0034.sql b/install/sql/incremental/upd_0034.sql
index 16d6a0d..8ae098c 100644
--- a/install/sql/incremental/upd_0034.sql
+++ b/install/sql/incremental/upd_0034.sql
@@ -1,4 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
 
 --
 -- Table structure for table `aps_instances`
@@ -54,7 +54,7 @@
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `aps_settings`
+-- Table structure for table `aps_settings`
 --
 
 CREATE TABLE IF NOT EXISTS `aps_settings` (
@@ -65,6 +65,8 @@
   UNIQUE KEY `name` (`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
 
+-- --------------------------------------------------------
+
 --
 -- Dumping data for table `aps_settings`
 --

--
Gitblit v1.9.1