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 <baronNOSPAMbundesbrandschatzamt.de>

diff --cc bba.org
Simple merge