Merge branch 'master' of https://github.com/jarkkos/smack
authorBrian McGillion <brian.mcgillion@intel.com>
Tue, 15 Nov 2011 11:46:49 +0000 (13:46 +0200)
committerBrian McGillion <brian.mcgillion@intel.com>
Tue, 15 Nov 2011 11:46:49 +0000 (13:46 +0200)
commitfbfc61bc7130a1dcd5e98cefcc90d4223126ceb6
treecffd9b5b5eaaf095fcdba4261b89e80aa1dfe4a5
parent70cd2fc483e260d35c0f3cdc9655383f7f21b511
parent51a060475858873987c2acb059a6b967669a3db5
Merge branch 'master' of https://github.com/jarkkos/smack