Merge remote-tracking branch 'smack-1.0.x/master'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 25 Nov 2013 14:07:17 +0000 (16:07 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 25 Nov 2013 14:07:17 +0000 (16:07 +0200)
commit9d47bcf0cc731593dfc4f867a885b31640417865
treecb3370c09dd8e0f1f89b114dba110cfb24ee8490
parented2cb91addb83fc52b3c8f3af8b66a78a7a3537d
parent8fd016791883705fc17598b89a3d54633c3dc5ca
Merge remote-tracking branch 'smack-1.0.x/master'