projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b58c5e1 d93b825)
Merge pull request #1 from brianmcgillion/master
authorjarkkos <jarkko.sakkinen@iki.fi>
Fri, 11 Nov 2011 14:01:58 +0000 (06:01 -0800)
committerjarkkos <jarkko.sakkinen@iki.fi>
Fri, 11 Nov 2011 14:01:58 +0000 (06:01 -0800)
Commits as agreed


Trivial merge
Domain: Security / Access Control;