projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b85196d d2ba14f)
Merge pull request #10 from brianmcgillion/master
authorjarkkos <jarkko.sakkinen@iki.fi>
Thu, 15 Dec 2011 18:35:09 +0000 (10:35 -0800)
committerjarkkos <jarkko.sakkinen@iki.fi>
Thu, 15 Dec 2011 18:35:09 +0000 (10:35 -0800)
Include guard fix


Trivial merge
Domain: Security / Access Control;