Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Wed, 27 Nov 2013 12:07:06 +0000 (14:07 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Wed, 27 Nov 2013 12:07:06 +0000 (14:07 +0200)
commit16a15e4489d3f745d0016cfefd84c75864879d48
tree3229cce8d6faac22dc882b5ab43f42ae1c3a3aca
parent9d47bcf0cc731593dfc4f867a885b31640417865
parentd2283792f7c7ba3d3c05c3c7b3b7cb4800d1af7e
Merge branch 'v1.0.x'
libsmack/libsmack.c