From: Brian McGillion <brian.mcgillion@intel.com>
Date: Tue, 15 Nov 2011 11:46:49 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/jarkkos/smack
X-Git-Tag: accepted/trunk/20130107.204027~38^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbfc61bc7130a1dcd5e98cefcc90d4223126ceb6;p=platform%2Fupstream%2Fsmack.git

Merge branch 'master' of https://github.com/jarkkos/smack
---

fbfc61bc7130a1dcd5e98cefcc90d4223126ceb6