From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 6 Oct 2013 16:42:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=1a3dbe91b2456323c1fe53797da673b4d0f87e17;hp=2e053370ab64a3f516fc7f9e4897c5b48eae580d

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

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