Merge branch 'master' into tizen_2.3b
authorJae Yong Hwang <j_yong.hwang@samsung.com>
Fri, 29 Aug 2014 08:08:52 +0000 (17:08 +0900)
committerJae Yong Hwang <j_yong.hwang@samsung.com>
Fri, 29 Aug 2014 08:08:52 +0000 (17:08 +0900)
commita90d5a5d14c8bd3df670b0fa01f3c9e52aee287c
treee2610b08a6e1fbf0315921017102f9d29be07409
parentafefc6b56ae0c89e70f652d6ec176cd57177e125
parent5716819ce9319ffd11438e68e76504bafe1e6a8a
Merge branch 'master' into tizen_2.3b

Conflicts:
packaging/default-fonts-sdk.spec
packaging/default-fonts-sdk.spec