From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, fifteen,
 updated. 1a3dbe91b2456323c1fe53797da673b4d0f87e17
Date: Sun, 06 Oct 2013 18:44:55 +0200
Message-ID: <20131006164455.752AA206BE@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7477018600195752542=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============7477018600195752542==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  1a3dbe91b2456323c1fe53797da673b4d0f87e17 (commit)
       via  1bd3de895bd354ef9ec33930b25fd9679814e72d (commit)
       via  cd6c59aac1c89f75995cae71336309c24003871b (commit)
      from  2e053370ab64a3f516fc7f9e4897c5b48eae580d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a3dbe91b2456323c1fe53797da673b4d0f87e17
Merge: 2e05337 1bd3de8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Oct 6 18:42:53 2013 +0200

    Merge remote-tracking branch 'origin/next' into fifteen

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/wirelessclient.cgi | 4 ++--
 make.sh                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index c6e20a0..3c52803 100644
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -446,7 +446,7 @@ sub showEditBox() {
 			<table width=3D'100%'>
 				<tr>
 					<td class=3D'base' width=3D'20%'>$Lang::tr{'wlan client ssid'}:</td>
-					<td width=3D'40%'><input type=3D'text' name=3D'SSID' value=3D'$settings=
{'SSID'}' size=3D'25'/></td>
+					<td width=3D'40%'><input type=3D'text' name=3D'SSID' value=3D"$settings=
{'SSID'}" size=3D'25'/></td>
 					<td class=3D'base' width=3D'10%'>$Lang::tr{'enabled'}</td>
 					<td width=3D'30%'><input type=3D'checkbox' name=3D'ENABLED' $checked{'E=
NABLED'} /></td>
 				</tr>
@@ -464,7 +464,7 @@ sub showEditBox() {
 				</tr>
 				<tr>
 					<td class=3D'base' width=3D'20%'>$Lang::tr{'wlan client psk'}:&nbsp;</t=
d>
-					<td width=3D'40%'><input type=3D'password' name=3D'PSK' value=3D'$setti=
ngs{'PSK'}' size=3D'25'/></td>
+					<td width=3D'40%'><input type=3D'password' name=3D'PSK' value=3D"$setti=
ngs{'PSK'}" size=3D'25'/></td>
 					<td colspan=3D"2" width=3D'40%'></td>
 				</tr>
 			</table>
diff --git a/make.sh b/make.sh
index 9bae8a6..9619ad3 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME=3D"IPFire"							# Software name
 SNAME=3D"ipfire"							# Short name
 VERSION=3D"2.13"							# Version number
 CORE=3D"73"							# Core Level (Filename)
-PAKFIRE_CORE=3D"72"						# Core Level (PAKFIRE)
+PAKFIRE_CORE=3D"73"						# Core Level (PAKFIRE)
 GIT_BRANCH=3D`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN=3D"www.ipfire.org"						# Software slogan
 CONFIG_ROOT=3D/var/ipfire						# Configuration rootdir


hooks/post-receive
--
IPFire 2.x development tree

--===============7477018600195752542==--