Merge branch 'upstream' into tizen 89/73389/1 accepted/tizen/common/20160614.143705 accepted/tizen/ivi/20160614.041244 accepted/tizen/mobile/20160614.041224 accepted/tizen/tv/20160614.041237 accepted/tizen/wearable/20160614.041229 submit/tizen/20160613.080449
authorsangsu <sangsu.choi@samsung.com>
Wed, 8 Jun 2016 01:37:43 +0000 (10:37 +0900)
committersangsu <sangsu.choi@samsung.com>
Wed, 8 Jun 2016 03:59:59 +0000 (12:59 +0900)
commite65cbd2e89245c5609d30e042f05b3ee693eec49
tree4c31ea097b5c02ebf0f8ed34bbbb832386d0956c
parentcb9b5dead12d04095da0e0416d22b7b5ab61ffbd
parent1bd29a24229d1e3822fc47fdd4aac3c2ab9b8b85
Merge branch 'upstream' into tizen

Change-Id: Ibec5317981dc6c41a1708da7db83255010d57438
Signed-off-by: sangsu <sangsu.choi@samsung.com>
Makefile.am
aclocal.m4
gl/Makefile.am
gl/m4/gnulib-common.m4
packaging/gnutls.spec