projects
/
framework
/
security
/
smack.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf06dd3
233dc30
)
Merge remote-tracking branch 'jsakkine/issue64' into v1.0.x
author
Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com>
Thu, 28 Nov 2013 16:04:12 +0000
(18:04 +0200)
committer
Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com>
Thu, 28 Nov 2013 16:04:12 +0000
(18:04 +0200)
Trivial merge