projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a726326 3d73d2d)
Merge remote-tracking branch 'rafal-krypa/issue70' into v1.0.x
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 2 Dec 2013 16:22:49 +0000 (18:22 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 2 Dec 2013 16:22:49 +0000 (18:22 +0200)

Trivial merge
Domain: Security / Access Control;