[dak/master] update with what we have on franck

[Joerg Jaspert <joerg@debian.org>]

---
 config/debian/apache.conf-ftp |    4 ++++
 config/homedir/.bashrc        |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index 52a8552..a326bb2 100644
--- a/config/debian/apache.conf-ftp
+++ b/config/debian/apache.conf-ftp
@@ -18,5 +18,9 @@
     Options MultiViews Indexes SymLinksIfOwnerMatch
   </Directory>
 
+  <Directory /srv/ftp.debian.org/web>
+    AddCharset utf-8 .txt
+  </Directory>
+
   RewriteEngine On
   RewriteRule ^/~(.+) /users/$1 [R=permanent,L]
diff --git a/config/homedir/.bashrc b/config/homedir/.bashrc
index 2a4fd45..881e730 100644
--- a/config/homedir/.bashrc
+++ b/config/homedir/.bashrc
@@ -54,6 +54,7 @@ export EDITOR=$(which vim)
 export HISTFILESIZE=6000
 export GREP_OPTIONS="--color=auto"
 export CDPATH=".:~:${base}:${public}:${queuedir}"
+export PATH="~/bin/:${PATH}"
 
 alias base='cd ${base}'
 alias config='cd ${configdir}'
-- 
1.7.2.5