projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16a15e4 9fabf14)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Wed, 27 Nov 2013 12:17:45 +0000 (14:17 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Wed, 27 Nov 2013 12:17:45 +0000 (14:17 +0200)

Trivial merge
Domain: Security / Access Control;