From: Dan White <dan@whiteaudio.com>
Date: Wed, 17 May 2017 15:00:19 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=valpo-ValpoSensorNet.git

Merge remote-tracking branch 'refs/remotes/origin/master'
---

14aa63980e2d47f57b56e2b6e760c388627abc96