Merge branch 'tizen_2.0'
authorJaeyun Jeong <jyjeong@samsung.com>
Thu, 14 Feb 2013 05:56:56 +0000 (14:56 +0900)
committerJaeyun Jeong <jyjeong@samsung.com>
Thu, 14 Feb 2013 05:56:56 +0000 (14:56 +0900)
commitc06b1f98418e08c263faf4ecbe9a90aec4e17255
treec34f8814d55c2ae431fada596bd1a6b5057db2d8
parentf5d8380089e68aa0aa10c48cf7558ec1a8f8d340
parentde1b2b4b6959c5eb507b2b5a1d39cc5c06d7c333
Merge branch 'tizen_2.0'

Conflicts:
packaging/org.tizen.message.spec

> Conflict is fixed.

Change-Id: I77b05f65de9ce5a666751ccecaf784b52c0e0b81
packaging/org.tizen.message.spec