Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Dec 2013 18:12:18 +0000 (20:12 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Dec 2013 18:12:18 +0000 (20:12 +0200)
1  2 
libsmack/libsmack.c

Simple merge