From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun, 6 Nov 2011 15:51:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=5b7268befaa7b1151a7e1fc82c11bc66dfad5b4b;hp=18eb08becd28e7f308b4debe318465af3b3b53c7

Merge remote-tracking branch 'origin/master'
---

diff --git a/.bashrc b/.bashrc
index f66ac8e..f401ff2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -368,6 +368,7 @@ function rpmsrclist
 function valgrind {(set -e;unset valgrind;s=~/.python.valgrind;rm -f $s;cp -p /usr/share/doc/python-devel-2.*/valgrind-python.supp $s;patch $s <$s.patch;perl -i -e 'undef $/;$_=<>;1 while s/^(?:###)?({\n)(?:###)?( *ADDRESS_IN_RANGE.*\n(?:[^}#].*\n)*)###/$1$2/gm;print;' $s;valgrind --num-callers=50 --suppressions=$s "$@";);}
 function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
 function gitcommit { git commit -a -m .; }
+function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"; );}
 
 ulimit -S -c 0
 set +H
diff --git a/.netrc b/.netrc
index fae319c..46e7cee 100644
--- a/.netrc
+++ b/.netrc
@@ -1,5 +1,5 @@
 default 
-	login anonymous password lace@jankratochvil.net
+	login anonymous password jan@jankratochvil.net
 	macdef init
 		prom
 		bi