projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e4ea91 d45ffe9)
Merge branch 'cipso_bug' of git://github.com/zos/smack into zos-cipso_bug
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 8 Oct 2013 14:36:32 +0000 (17:36 +0300)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 8 Oct 2013 14:36:32 +0000 (17:36 +0300)

Trivial merge
Domain: Security / Access Control;