Merge remote-tracking branch 'smack-1.0.x/master'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 25 Nov 2013 14:00:45 +0000 (16:00 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 25 Nov 2013 14:00:45 +0000 (16:00 +0200)
commited2cb91addb83fc52b3c8f3af8b66a78a7a3537d
treed20e0c30365445dab9593d4c6a28066e32f615e7
parent6304f9a3f73312a7feb3b25fa593919744acb947
parentd4c340a97466261c846c211690ab7775b6bbf657
Merge remote-tracking branch 'smack-1.0.x/master'