Merge remote-tracking branch 'jobol/issue94' into v1.0.x
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 20 Feb 2014 11:27:06 +0000 (13:27 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 20 Feb 2014 11:27:06 +0000 (13:27 +0200)
1  2 
libsmack/libsmack.c

Simple merge