From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 23 Apr 2010 20:01:17 +0000 (+0200)
Subject: Merge remote branch 'rammstein/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=0388e4464474e155fd41d18266813d9ac5795cac

Merge remote branch 'rammstein/master'
---

0388e4464474e155fd41d18266813d9ac5795cac
diff --cc zsh/rc
index 6fcc820,ee2737b..1a30e83
--- a/zsh/rc
+++ b/zsh/rc
@@@ -496,10 -482,10 +501,10 @@@ if [[ $uname == Linux ]]; the
      # Settings when creating Debian packages.
      DEBEMAIL=simon@ruderich.org
      export DEBEMAIL
 -    DEBFULLNAME="Simon Ruderich"
 +    DEBFULLNAME='Simon Ruderich'
      export DEBFULLNAME
  
- elif [[ $(uname) == Darwin ]]; then # Mac OS X
+ elif [[ $uname == Darwin ]]; then # Mac OS X
      # Store the current clipboard in CLIPBOARD before every command so it can
      # be used in commands.
      os_darwin_preexec() {