projects
/
framework
/
security
/
smack.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fae10fd
05f0545
)
Merge branch 'v1.0.x'
author
Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com>
Tue, 10 Dec 2013 11:20:45 +0000
(13:20 +0200)
committer
Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com>
Tue, 10 Dec 2013 11:20:45 +0000
(13:20 +0200)
Trivial merge