Merge remote-tracking branch 'jsakkine/issue83' into v1.0.x
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 23 Jan 2014 12:54:39 +0000 (14:54 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 23 Jan 2014 12:54:39 +0000 (14:54 +0200)
commitd4d8cfa3759c0e176b9f0129f145714e09c7f62d
tree8c2b1b6a52dca77bb8c20d6565b3be3008cfdc64
parent7caca2865ad202225f6eca7f22ba434be988d921
parent78e66b1e90ca6124fbdcba490958923c7243f128
Merge remote-tracking branch 'jsakkine/issue83' into v1.0.x

Conflicts:
libsmack/libsmack.c
libsmack/libsmack.c