projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fae10fd 05f0545)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 10 Dec 2013 11:20:45 +0000 (13:20 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 10 Dec 2013 11:20:45 +0000 (13:20 +0200)

Trivial merge
Domain: Security / Access Control;