projects / framework / security / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70cd2fc 51a0604)
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)

Trivial merge
Domain: Security / Uncategorized;