Bugfix: unmerged changes commited by error in f935220c
Merge branch 'master' of github.com:pdav/netmagis