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. 6b0d7d6bc3e5870a8f0ada33e2ab3170f942db9e
Date: Fri, 04 Oct 2013 16:55:43 +0200
Message-ID: <20131004145543.BDDD420F76@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2477812277813621417=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2477812277813621417==
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  6b0d7d6bc3e5870a8f0ada33e2ab3170f942db9e (commit)
       via  be5b660500596f860a6ba3478aac441b86f60626 (commit)
      from  4598f16cfddf949149f4b00f554d8991a192a84f (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 6b0d7d6bc3e5870a8f0ada33e2ab3170f942db9e
Merge: 4598f16 be5b660
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 4 16:55:20 2013 +0200

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

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

Summary of changes:
 html/cgi-bin/wirelessclient.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index c6e20a0..07ab638 100644
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2012  IPFire Team  <info(a)ipfire.org>                      =
    #
+# Copyright (C) 2012-2013  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -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$settin=
gs{'PSK'} size=3D'25'/></td>
 					<td colspan=3D"2" width=3D'40%'></td>
 				</tr>
 			</table>


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

--===============2477812277813621417==--