Merge pull request #211 from affansyed/master
authorBrenden Blanco <bblanco@gmail.com>
Tue, 15 Sep 2015 02:47:26 +0000 (19:47 -0700)
committerBrenden Blanco <bblanco@gmail.com>
Tue, 15 Sep 2015 02:47:26 +0000 (19:47 -0700)
updated  mainline version to support bridge


Trivial merge