Merge branch 'tizen' into tizen_base 18/63818/1 submit/tizen_base/20160411.015551
authorDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 28 Mar 2016 03:02:58 +0000 (12:02 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 28 Mar 2016 03:02:58 +0000 (12:02 +0900)
commitc4306b1bab8742cbc0b1d700b3722ad3181275e6
tree93eb830a22ff1356973f1681af2fde5f5cebbf5a
parente52e7cd8d3553116787eb0573f3b3d379f09698a
parent631eb6444d95f63ed6ebec82a8983bd34d2fa173
Merge branch 'tizen' into tizen_base

Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Conflicts:
SAX2.c
packaging/libxml2.manifest
packaging/libxml2.spec
packaging/python-libxml2.spec

Change-Id: I90f1ac4e938f1107dac1e851821de691531a8836