From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Thu, 5 Dec 2013 17:27:49 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: v1.1.0~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5764ae29e2b1ac5603e2ad504efc15d15d5b62fd;p=platform%2Fupstream%2Fsmack.git

Merge branch 'v1.0.x'
---

5764ae29e2b1ac5603e2ad504efc15d15d5b62fd