From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Wed, 18 Dec 2013 19:40:47 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: v1.1.0~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=130177c3f3bf73a2f05b74eaa3bff0df79a057d0;p=platform%2Fupstream%2Fsmack.git

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

130177c3f3bf73a2f05b74eaa3bff0df79a057d0