From: Rafal Krypa <r.krypa@samsung.com>
Date: Fri, 9 Jan 2015 10:41:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'tizen/upstream' into tizen
X-Git-Tag: accepted/tizen/common/20150113.085455~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F24%2F33424%2F1;p=platform%2Fupstream%2Fsmack.git

Merge remote-tracking branch 'tizen/upstream' into tizen

Change-Id: Ib8d978e8e9f223c8b76b52e6e0e04ce0949cf5a2
---

82a57a763395134639bb13c8de2b7f7c99140e9f