Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fri, 10 Jan 2014 17:33:59 +0000 (19:33 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fri, 10 Jan 2014 17:33:59 +0000 (19:33 +0200)
commit90177ffda8dced012c268d7da173463aa27b3282
tree9df7d600f7ef389fe36ffb15c4a6b29779f93bae
parent5090005ef32f57af1333c27945542a1063055a56
parent422b3e890de18be3aa6da437017759e6b76b3c8e
Merge branch 'v1.0.x'
configure.ac
libsmack/libsmack.c