Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 20 Feb 2014 11:35:38 +0000 (13:35 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 20 Feb 2014 11:35:38 +0000 (13:35 +0200)
commitc625a7d6bbb98e7322738914a6bba20234d2448f
tree0ca67647edc8d08eea8d7c95cfa94380ab121d23
parent90177ffda8dced012c268d7da173463aa27b3282
parenta496eff9c49b9257aa019250971f7fd61622ec19
Merge branch 'v1.0.x'

Conflicts:
configure.ac
libsmack/Makefile.am
libsmack/libsmack.c
libsmack/libsmack.c