From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Tue, 3 Dec 2013 16:29:34 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: v1.1.0~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56642fbfea6397a0db561d76a9c3f26197de87b7;p=platform%2Fupstream%2Fsmack.git

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

56642fbfea6397a0db561d76a9c3f26197de87b7