Merge branch 'master' into tizen_2.3b
authorJae Yong Hwang <j_yong.hwang@samsung.com>
Mon, 15 Sep 2014 01:38:44 +0000 (10:38 +0900)
committerJae Yong Hwang <j_yong.hwang@samsung.com>
Mon, 15 Sep 2014 01:38:44 +0000 (10:38 +0900)
commit3dee2a7c7d9bf7543bed95eecb25de45ddc449ee
tree6e408e117b4a00d4204d2b6941da24f8ffd9328e
parenta90d5a5d14c8bd3df670b0fa01f3c9e52aee287c
parentb2f97a2895dd69ec7140d7652e46b3962c071bff
Merge branch 'master' into tizen_2.3b

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