Merge remote-tracking branch 'origin/release-20161231' into HEAD

author SoonKyu Park <sk7.park@samsung.com>

Wed, 28 Dec 2016 13:56:50 +0000 (22:56 +0900)

committer SoonKyu Park <sk7.park@samsung.com>

Wed, 28 Dec 2016 13:56:50 +0000 (22:56 +0900)
author SoonKyu Park <sk7.park@samsung.com>
Wed, 28 Dec 2016 13:56:50 +0000 (22:56 +0900)
committer SoonKyu Park <sk7.park@samsung.com>
Wed, 28 Dec 2016 13:56:50 +0000 (22:56 +0900)
diff --cc debian/changelog

index 581544d,199e232..199e232

mode 100755,100644..100755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
diff --cc packaging/git-buildpackage.changes

index 7f8a5ef,07073f7..07073f7

mode 100755,100644..100755
--- 1/packaging/git-buildpackage.changes
--- 2/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
diff --cc packaging/git-buildpackage.spec

index 6093960,e1dd8db..e1dd8db

mode 100755,100644..100755
--- 1/packaging/git-buildpackage.spec
--- 2/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
author	SoonKyu Park <sk7.park@samsung.com>
	Wed, 28 Dec 2016 13:56:50 +0000 (22:56 +0900)
committer	SoonKyu Park <sk7.park@samsung.com>
	Wed, 28 Dec 2016 13:56:50 +0000 (22:56 +0900)
		1	2
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/git-buildpackage.changes	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/git-buildpackage.spec	patch \|	diff1 \|	diff2 \|	blob \| history