Handle conflicts merging from master branch

Change-Id: I7716a4373225efed72f0d13037c512da3cd05d28

diff --cc data/gbs
Simple merge

diff --cc debian/changelog
index 56b8826,b0be6ac..6408aea
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
 - -- SoonKyu Park <sk7.park@samsung.com> Sat, 14 Jan 2017 19:30:00 +0800
+ depanneur (0.15.4) unstable; urgency=high
+ 
+   * Support 'Recommands:' inside spec file
+ 
++ -- SoonKyu Park <sk7.park@samsung.com>  Sat, 14 Jan 2017 19:30:00 +0800
+ 
  depanneur (0.15.3) unstable; urgency=high
  
    * Enable kvm build function.

diff --cc depanneur
Simple merge