Handle conflict from git merge release-20160315

diff --cc debian/changelog
index 27bb4fa89e5214ae139cb3854c3564fe2bdda6b9,25f7bb5f50e2087c8136d0698b1f995b46b35d67..2728902dda674c535fe53e72863a24374b5e7cde
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,12 @@@
- gbs (0.23.3) unstable; urgency=high
-   * upgrade to gbs v0.23.3, which contains the following bug fixing & features:
+ gbs (0.24) unstable; urgency=high
+   * upgrade to gbs v0.24, which contains the following bug fixing & features:
      * bug fix:
-       - export: fix issue about always creating tarball multi times
-                 for native packages with multi specs
+       - fix Security issues that normal user can gain root permission with gbs chroot
+       - fix  git-build-package bugs and imporve some performance
+     *Add --fail-fast option.
  
-  -- Li Jinjing <jinjingx.li@intel.com> Mon, 20 Apr 2015 10:36:15 +0800
+  -- Wang Jun <junbill.wang@samsung.com>  Wed, 2 Mar 2016 10:00:00 +0800
  
 -
  gbs (0.23.2) unstable; urgency=high
    * upgrade to gbs v0.23.2, which contains the following bug fixing & features:
      * bug fix: