From: Andreas Gerler Date: Sat, 22 Nov 2014 18:27:04 +0000 (+0100) Subject: Merge branch 'master' of git.bundesbrandschatzamt.de:emacsconfig X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=a2efe882b32637aab3530df76b678bfeba2c2567;p=emacsconfig.git Merge branch 'master' of git.bundesbrandschatzamt.de:emacsconfig # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. Signed-off-by: Andreas Gerler --- a2efe882b32637aab3530df76b678bfeba2c2567