Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Jun 2014 16:24:46 +0000 (19:24 +0300)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Jun 2014 16:24:46 +0000 (19:24 +0300)
commite350b66f14cf385cb1b84033a67390dc7d8eb830
tree5b43c1611858010dbff25922bd024a369dc84796
parenta8dad3d28ecbf9c048dfefb3f26348243bc6991c
parent33ed2e073204e69371cea315f4e68a27c79547f9
Merge branch 'v1.0.x'
libsmack/libsmack.c