projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b42ea8 0e97d36)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 3 Dec 2013 16:29:34 +0000 (18:29 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 3 Dec 2013 16:29:34 +0000 (18:29 +0200)

Trivial merge
Domain: Security / Access Control;