Merge branch 'master' into systemd
authorYin Kangkai <kangkai.yin@intel.com>
Fri, 23 Nov 2012 01:23:34 +0000 (09:23 +0800)
committerYin Kangkai <kangkai.yin@intel.com>
Fri, 23 Nov 2012 01:23:34 +0000 (09:23 +0800)
commit7dc0929d24a67391e71e4e07f385acc7b7db1850
treef634c083f757c65086dd00cb7f96a448aeba97e9
parentaea3b6fbd065f26f38d4f3f8f67159fc62d42acd
parent1da0de72b3313d035b7748060c91ab54b5871c77
Merge branch 'master' into systemd

Conflicts:
packaging/msg-service.spec

Change-Id: I9262bd6ef6a2d013944550b5fd6b84a1f8c7f7f2
Signed-off-by: Yin Kangkai <kangkai.yin@intel.com>
packaging/msg-service.spec