Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
	po/pakfire.pot

diff --cc macros/constants.macro
Simple merge

diff --cc python/pakfire/base.py
Simple merge

diff --cc python/pakfire/builder.py
Simple merge

diff --cc python/pakfire/cli.py
Simple merge

diff --cc python/pakfire/constants.py
Simple merge

diff --cc python/pakfire/errors.py
Simple merge

diff --cc python/pakfire/packages/make.py
Simple merge

diff --cc scripts/pakfire-multicall.py
Simple merge