Merge branch 'tizen_2.0'

Conflicts:
	packaging/org.tizen.message.spec

> Conflict is fixed.

Change-Id: I77b05f65de9ce5a666751ccecaf784b52c0e0b81

diff --git a/packaging/org.tizen.message.spec b/packaging/org.tizen.message.spec
index cf33dc6..5877a9a 100755 (executable)
--- a/packaging/org.tizen.message.spec
+++ b/packaging/org.tizen.message.spec
@@ -138,6 +138,11 @@ ln -sf /usr/bin/ug-client /usr/ug/bin/msg-composer-efl
 - Fix N_SE-22522, uri of filepath is supported.
 
 * Mon Jan 21 2013 Jaeyun Jeong <jyjeong@samsung.com>
+- Change license URL from "tizenopensource.org" to "floralicense.org".
+- Change enum value related with SESSION policy in MMFW.
+  (It is re-submitted because of invalid tag.)
+
+* Mon Jan 21 2013 Jaeyun Jeong <jyjeong@samsung.com>
 - Apply EFL API changes.
 - Change elm_scale_get to elm_config_scale_get of composer.
 - Change name of deprecated api elm_scale_get() to elm_config_scale_get().