Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Wed, 3 Apr 2013 20:45:53 +0000 (22:45 +0200)
committerJoerg Jaspert <joerg@debian.org>
Wed, 3 Apr 2013 20:45:53 +0000 (22:45 +0200)
commit4ff4cb0a1d05abd9af1437501788609bd74f178b
treeb4d5937eaf445d87ac299e17b89b1d187e5880ae
parentb164bf15c48b4bf98b829fd968a9e5c9c1e9c980
parentfddbabc18abcea1fb5119d74f1d8a6749280eda2
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  linws03 specific
  add linws config file
  whitespace and hippe-expand

Conflicts:
.emacs.d/config/emacs.org
.emacs.d/config/emacs.org