# HG changeset patch
# User cavaliet
# Date 1330077301 -3600
# Node ID ac9a9b5d2987c375be604a977e3f1e8577a65074
# Parent  c8ecf6c0bdd3bded9459d74071c7c82f66689aa8# Parent  e50277f02cc161f558060454b5b2741f8830fcf7
merge

diff -r e50277f02cc1 -r ac9a9b5d2987 .hgsubstate
--- a/.hgsubstate	Thu Feb 23 23:02:07 2012 +0100
+++ b/.hgsubstate	Fri Feb 24 10:55:01 2012 +0100
@@ -1,1 +1,1 @@
-ca2a145e67f350ba8d00c9ff62e9ad001f2c1c8e vendor/bundles/IRI/Bundle/WikiTagBundle
+021131fbe2c571695ce3bac8f1ff26ccae33cc72 vendor/bundles/IRI/Bundle/WikiTagBundle
diff -r e50277f02cc1 -r ac9a9b5d2987 app/config/config.yml
--- a/app/config/config.yml	Thu Feb 23 23:02:07 2012 +0100
+++ b/app/config/config.yml	Fri Feb 24 10:55:01 2012 +0100
@@ -98,6 +98,16 @@
         contributor: [ 'order', 'label', 'wikipedia_link', 'wikipedia_permalink', 'delete_wikipedia_link', 'remove_tag_from_list' ]
         another:     [ 'sort_tag', 'order', 'move_up_down', 'id', 'label', 'wikipedia_link', 'remove_tag_from_list' ]
         test:        [ 'order', 'id', 'move_up_down', 'label', 'wikipedia_link', 'wikipedia_permalink', 'dbpedia_link', 'remove_wikipedia_link', 'remove_tag_from_list', 'alternative_wikipedia_url' ]
+    # Options for curl_setopt, typically proxy settings. If you want to use constant values, just write for example 'CURLOPT_PROXYAUTH' or 'CURLAUTH_NTLM'.
+    # The program will check if the string gives an existing constant
+    # For boolean, just write 'TRUE' or 'FALSE'. 
+    curl_options:
+        CURLOPT_HTTPPROXYTUNNEL:  'TRUE'
+        CURLOPT_PROXYAUTH: 'CURLAUTH_NTLM'
+        CURLOPT_USERAGENT: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.1) Gecko/20100101 Firefox/10.0.1'
+        CURLOPT_PROXY: 'derain.centrepompidou.lan:3128'
+        CURLOPT_PROXYUSERPWD: 'DOM-CNAC\cavaliet:thibaut';
+        CURLOPT_PROXYTYPE: 'CURLPROXY_HTTP'
 
 
 services: