Merge branch 'master' into travis
authorHenry Van Styn <vanstyn@intellitree.com>
Fri, 26 Sep 2014 22:03:04 +0000 (18:03 -0400)
committerHenry Van Styn <vanstyn@intellitree.com>
Fri, 26 Sep 2014 22:03:04 +0000 (18:03 -0400)
commit85d1a5f04b7801225c64f6ca2151460419ba734c
treee99cf3fae7a721bab74118094950028bcaeb803c
parent94538c9e191fa4ed0ea5396f591ee94025e9d11e
parent1e2e8a35f1ec46fef5cb6c4b213142335721b61a
Merge branch 'master' into travis