From: Andreas Gerler Date: Thu, 26 Mar 2015 09:16:20 +0000 (+0100) Subject: Merge branch 'master' of git.bundesbrandschatzamt.de:emacsconfig X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=cf4c5b58733428915beb7e4f73d294df9be251e1;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 --- cf4c5b58733428915beb7e4f73d294df9be251e1