From f59933934b10dc55513df4a994cf4ab3fa45c0df Mon Sep 17 00:00:00 2001
From: mfr69bs <mfr69bs@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Fri, 6 Jul 2012 22:04:12 +0000
Subject: [PATCH] needless global attributes for update-command removed.

git-svn-id: https://svn.fhem.de/fhem/trunk@1698 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                   | 2 --
 fhem/FHEM/FhemUtils/release.pm | 2 +-
 fhem/fhem.pl                   | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 8d9666c66..e0eeb35d6 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -52,8 +52,6 @@
   - feature: motd with SecurityCheck added
   - feature: telnet module added, attr global port moved. allowfrom changed.
   - feature: FhemUtils/release.pm for the new update process added. (M. Fischer)
-  - feature: new global attributes updateserver, updatepath, updatectrlfile
-             for the new update process added (M. Fischer)
 
 - 2011-12-31 (5.2)
   - bugfix:  applying smallscreen attributes to firefox/opera
diff --git a/fhem/FHEM/FhemUtils/release.pm b/fhem/FHEM/FhemUtils/release.pm
index 18f37f988..d83b67c53 100644
--- a/fhem/FHEM/FhemUtils/release.pm
+++ b/fhem/FHEM/FhemUtils/release.pm
@@ -12,7 +12,7 @@ use vars qw(%UPDATE);
 
 $DISTRIB_ID="Fhem";
 $DISTRIB_RELEASE="5.2";
-$DISTRIB_BRANCH="EXPERIMENTAL";
+$DISTRIB_BRANCH="DEVELOPMENT";
 $DISTRIB_DESCRIPTION="$DISTRIB_ID $DISTRIB_RELEASE ($DISTRIB_BRANCH)";
 
 $UPDATE{server}   = "http://fhem.de";
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 21ff19f79..cd462f836 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -196,8 +196,7 @@ $modules{Global}{AttrList} =
   "verbose:1,2,3,4,5 mseclog version nofork logdir holiday2we " .
   "autoload_undefined_devices dupTimeout latitude longitude " .
   "backupcmd backupdir backupsymlink backup_before_update " .
-  "exclude_from_update motd updatebranch updateserver updatepath " .
-  "updatectrlfile ";
+  "exclude_from_update motd updatebranch ";
 
 $modules{Global}{AttrFn} = "GlobalAttr";