Merge branch 'master' of github.com:brianmcgillion/smack
authorBrian McGillion <brian.mcgillion@intel.com>
Tue, 15 Nov 2011 10:17:27 +0000 (12:17 +0200)
committerBrian McGillion <brian.mcgillion@intel.com>
Tue, 15 Nov 2011 10:17:27 +0000 (12:17 +0200)
commit70cd2fc483e260d35c0f3cdc9655383f7f21b511
tree109f673620061ca48049a9d46aae383ea81cf5c0
parentac028f67ba540b74d2f7d9b169ceaff548ba5f43
parentdaef7b06f19b3e9a63b94fb99a53efdf1acf3bd2
Merge branch 'master' of github.com:brianmcgillion/smack