Merge branch 'master' of /var/www/wertarbyte.de/git/ifupdown-scripts-wa

Conflicts:

	debian/rules
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.
#

# Please enter the commit message for your changes.
# (Comment lines starting with '#' will not be included)
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#	unmerged:   debian/rules
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	build-stamp
#	configure-stamp
#	debian/files
#	debian/ifupdown-scripts-wa.debhelper.log
#	debian/ifupdown-scripts-wa/
