diff --git a/manifest b/manifest
index 6e779b8..d9f2b41 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Removed\sall\spath\sconversion\sfor\sthe\sgdiff\sand\sgmerge\ssettings.\nThe\ssettings\sare\snow\sstored\sin\sthe\splatform\snative\sformat.\sThis\sshould\sfix\sthe\sissue\swhere\sfuel\swas\sproviding\sfossil\swith\san\sincorrect\scommand\sline\sfor\sthe\sgmerge\ssetting
-D 2014-08-06T10:06:10.992
+C Added\sHTPP\sProxy\sglobal\ssetting\n
+D 2014-08-06T10:43:45.077
 F dist/arch/PKGBUILD 1d72dad77767f94a6b1a018067188e61927fa564
 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
 F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
@@ -189,8 +189,8 @@ F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
 F src/MainWindow.cpp f321f9e0b9aa3f55966f3c19fb3d3c3488676fe1
 F src/MainWindow.h dc0a9ed7de8a338e56c38c00ec303796f31bd24d
-F src/SettingsDialog.cpp 515166bcaedf16432208bf8ef6bffec1529b1198
-F src/SettingsDialog.h 01c1f876c64f750ba8820a0d745e377acabe4921
+F src/SettingsDialog.cpp d428569ce54c38bc979cf06d9a04f6e7f4a76a6d
+F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
 F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77
 F src/Utils.h c546e478a1225a28c99cd4c30f70cf9be9804a2a
 F src/main.cpp 99a9d7e0634f4ea54259542cacfbb9d1e76ccb75
@@ -200,8 +200,8 @@ F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
 F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
-F ui/SettingsDialog.ui 55aefad7145c40d936c43759789d1b50e361b020
-P 872751fabaa47ac1f1f9d4caa4bdb42ae2e371cd
-R c0ce9739ba0809720ddd275ca5e66571
+F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
+P c57c6d52cc3314fdf7a261ec5d23f84da7cb55ea
+R 06761c8737b40e822f72edd98ec944a7
 U Kostas
-Z 0f01ed065c4316a05b26b5aa37511ad2
+Z cff6908be5bbb900a75531f40ed4eb51
diff --git a/manifest.uuid b/manifest.uuid
index 8401094..a89aec4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c57c6d52cc3314fdf7a261ec5d23f84da7cb55ea
\ No newline at end of file
+6aae13994552e35d6bac4e0936b032a1179c1466
\ No newline at end of file
diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index bf7b1f4..ccf24d7 100644
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -66,9 +66,12 @@ SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) :
 				ui->cmbActiveLanguage->findText(
 					LangIdToName(lang)));
 
-	// Repo Settings
+	// Global Settings
 	ui->lineGDiffCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString());
 	ui->lineGMergeCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GMERGE_CMD).toString());
+	ui->lineProxy->setText(settings->GetFossilValue(FOSSIL_SETTING_PROXY_URL).toString());
+
+	// Repository Settings
 	ui->lineRemoteURL->setText(settings->GetFossilValue(FOSSIL_SETTING_REMOTE_URL).toString());
 	ui->lineIgnore->setText(settings->GetFossilValue(FOSSIL_SETTING_IGNORE_GLOB).toString());
 	ui->lineIgnoreCRNL->setText(settings->GetFossilValue(FOSSIL_SETTING_CRNL_GLOB).toString());
@@ -107,10 +110,13 @@ void SettingsDialog::on_buttonBox_accepted()
 
 	settings->SetFossilValue(FOSSIL_SETTING_GDIFF_CMD, ui->lineGDiffCommand->text());
 	settings->SetFossilValue(FOSSIL_SETTING_GMERGE_CMD, ui->lineGMergeCommand->text());
+	settings->SetFossilValue(FOSSIL_SETTING_PROXY_URL, ui->lineProxy->text());
+
 	settings->SetFossilValue(FOSSIL_SETTING_REMOTE_URL, ui->lineRemoteURL->text());
 	settings->SetFossilValue(FOSSIL_SETTING_IGNORE_GLOB, ui->lineIgnore->text());
 	settings->SetFossilValue(FOSSIL_SETTING_CRNL_GLOB, ui->lineIgnoreCRNL->text());
 
+
 	settings->ApplyEnvironment();
 }
 
@@ -185,6 +191,8 @@ Settings::Settings(bool portableMode) : store(0)
 {
 	Mappings.insert(FOSSIL_SETTING_GDIFF_CMD, Setting("", Setting::TYPE_FOSSIL_GLOBAL));
 	Mappings.insert(FOSSIL_SETTING_GMERGE_CMD, Setting("", Setting::TYPE_FOSSIL_GLOBAL));
+	Mappings.insert(FOSSIL_SETTING_PROXY_URL, Setting("", Setting::TYPE_FOSSIL_GLOBAL));
+
 	Mappings.insert(FOSSIL_SETTING_IGNORE_GLOB, Setting("", Setting::TYPE_FOSSIL_LOCAL));
 	Mappings.insert(FOSSIL_SETTING_CRNL_GLOB, Setting("", Setting::TYPE_FOSSIL_LOCAL));
 	Mappings.insert(FOSSIL_SETTING_REMOTE_URL, Setting("off", Setting::TYPE_FOSSIL_COMMAND));
diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h
index a3b564e..b57ba3b 100644
--- a/src/SettingsDialog.h
+++ b/src/SettingsDialog.h
@@ -20,6 +20,7 @@ namespace Ui {
 
 #define FOSSIL_SETTING_GDIFF_CMD			"gdiff-command"
 #define FOSSIL_SETTING_GMERGE_CMD			"gmerge-command"
+#define FOSSIL_SETTING_PROXY_URL			"proxy"
 #define FOSSIL_SETTING_IGNORE_GLOB			"ignore-glob"
 #define FOSSIL_SETTING_CRNL_GLOB			"crnl-glob"
 #define FOSSIL_SETTING_REMOTE_URL			"remote-url"
diff --git a/ui/SettingsDialog.ui b/ui/SettingsDialog.ui
index a277125..0117ecc 100644
--- a/ui/SettingsDialog.ui
+++ b/ui/SettingsDialog.ui
@@ -164,20 +164,46 @@
         </layout>
        </item>
        <item row="3" column="0">
+        <widget class="QLabel" name="label_44">
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>HTTP Proxy</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="lineProxy">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>The URL of the HTTP proxy</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
         <widget class="QLabel" name="uILanguageLabel_3">
          <property name="text">
           <string>HTTP Port</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
+       <item row="4" column="1">
         <widget class="QLineEdit" name="lineUIPort">
          <property name="toolTip">
           <string>HTTP port to use for the Fossil web interface</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label_6">
          <property name="minimumSize">
           <size>
@@ -190,7 +216,7 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="5" column="1">
         <widget class="QPushButton" name="btnClearMessageHistory">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -206,14 +232,14 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="6" column="0">
         <widget class="QLabel" name="uILanguageLabel_2">
          <property name="text">
           <string>Web Browser</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="6" column="1">
         <widget class="QComboBox" name="cmbFossilBrowser">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -226,7 +252,7 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
+       <item row="7" column="0">
         <widget class="QLabel" name="label_8">
          <property name="minimumSize">
           <size>
@@ -239,7 +265,7 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="7" column="1">
         <widget class="QComboBox" name="cmbDoubleClickAction">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -255,14 +281,14 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0">
+       <item row="8" column="0">
         <widget class="QLabel" name="uILanguageLabel">
          <property name="text">
           <string>Language</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
+       <item row="8" column="1">
         <widget class="QComboBox" name="cmbActiveLanguage">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">