projects / framework / security / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5afc579 63fed79)
Merge remote-tracking branch 'jobol/addgen' into v1.0.x
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 18 Feb 2014 08:34:05 +0000 (10:34 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 18 Feb 2014 08:34:05 +0000 (10:34 +0200)

Trivial merge
Domain: Security / Uncategorized;