Merge branch 'master' into devel

Change-Id: Icfcd06335af9da1501d03dbae38a06484dec1153

diff --cc debian/changelog
index 5461a513802edcf371577b3380b9da955701be3f,6227ecfa18422debc7289132d3d77b3a1b3543e8..6227ecfa18422debc7289132d3d77b3a1b3543e8
mode 100755,100644..100755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog

diff --cc docs/RELEASE_NOTES
index 2833939b5dc25aba6633ac12a0b6ada6bcab4a53,25746ca668b76ffd18e19785cc8f794fbe287ec4..25746ca668b76ffd18e19785cc8f794fbe287ec4
mode 100755,100644..100755
--- 1/docs/RELEASE_NOTES
--- 2/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES

diff --cc gitbuildsys/__init__.py
index fbd127996e1c087cbe7291b22ca3fb2e7fd779aa,4ab242c77dfeda49754c2430ffd19b47c4e38c9e..4ab242c77dfeda49754c2430ffd19b47c4e38c9e
mode 100755,100644..100755
--- 1/gitbuildsys/__init__.py
--- 2/gitbuildsys/__init__.py
+++ b/gitbuildsys/__init__.py

diff --cc gitbuildsys/cmd_build.py
index 948933a966397219548e0f5ed70e7720a2a58c52,5fdaa7507fa1ad7bef1aed497e983430b452b390..143756b9677baade4c991c0aca459c99a13cd811
--- 1/gitbuildsys/cmd_build.py
--- 2/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@@ -223,9 -223,7 +223,9 @@@ def prepare_depanneur_opts(args)
      if args.skip_srcrpm:
          cmd_opts += ['--skip-srcrpm']
      if args.fail_fast:
-            cmd_opts += ['--fail-fast']
+         cmd_opts += ['--fail-fast']
 +    if args.keepgoing:
 +        cmd_opts += ['--keepgoing=%s' % args.keepgoing]
      #
      if args.package_list:
          package_list = args.package_list.split(',')

diff --cc packaging/gbs.changes
index cb17097b35e949226fdf201f1fef49c53b24e328,88bd7869c626a3e3c8c19ce7bc3284ee0726fdfa..88bd7869c626a3e3c8c19ce7bc3284ee0726fdfa
mode 100755,100644..100755
--- 1/packaging/gbs.changes
--- 2/packaging/gbs.changes
+++ b/packaging/gbs.changes

diff --cc packaging/gbs.spec
index 5fc965cc836fe0ea7bb38920a7e6029ca4d243c2,7e54f83057b5fe1d094b8c82e92432f6a5a4a221..7e54f83057b5fe1d094b8c82e92432f6a5a4a221
mode 100755,100644..100755
--- 1/packaging/gbs.spec
--- 2/packaging/gbs.spec
+++ b/packaging/gbs.spec