Merge branch 'hotfix/1.3.2' v1.3.2
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 16:28:30 +0000 (12:28 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 16:28:30 +0000 (12:28 -0400)
commit257861fd033c7feccd7263c5ba0e7efdb2dca400
tree5c224728a880b3e549f0fe15b967f5cb9d361647
parent1a3127538feda6c51464f37c0654f177e60f7375
parent50ae29edd26ceb04f265571c2ce2f4977c3bd63b
Merge branch 'hotfix/1.3.2'