projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56642fb 2a10302)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Dec 2013 17:27:49 +0000 (19:27 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Dec 2013 17:27:49 +0000 (19:27 +0200)

Trivial merge
Domain: Security / Access Control;