Merge remote branch 'rammstein/master'

diff --cc zsh/rc
index 6fcc820c9e5e2fda8064c0b3e39768939ce3ec00,ee2737b833a4c5976dc378119baa06872d882c0f..1a30e83094e3b79c399731437295dcabe49d36da
--- 1/zsh/rc
--- 2/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() {