projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6fc649 20ac238)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 9 Dec 2013 13:07:07 +0000 (15:07 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 9 Dec 2013 13:07:07 +0000 (15:07 +0200)

Trivial merge
Domain: Security / Access Control;