The following commit has been merged in the merge/master branch: commit 243e53bf3c99a3c92a6e37effda5534a77f40c35 Merge: 89d7f01ec4e2c4cd6ab603d9d8f4284d9ae32dd7 a74eab639ec502eb744528ef7c271576d670aa7a Author: Antonio Quartulli antonio@meshcoding.com Date: Fri May 29 09:09:42 2015 +0200

Merge remote-tracking branch 'net-next/master' into merge/master