projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed2cb91 8fd0167)
Merge remote-tracking branch 'smack-1.0.x/master'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 25 Nov 2013 14:07:17 +0000 (16:07 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 25 Nov 2013 14:07:17 +0000 (16:07 +0200)

Trivial merge
Domain: Security / Access Control;