Merge branch 'hotfix/1.5.1' v1.5.1
authorIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 18:34:24 +0000 (14:34 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 18:34:24 +0000 (14:34 -0400)
commit33e9a625fedfd0fc74455c09a4ec96f8c956c4c1
tree8da66884129b10078fee2ef99ce8ac48cec8ec6b
parent4d9514ff126c44e5389921c17e85896f0896de59
parent8940a5489710568c53d75923237c13aafffe0168
Merge branch 'hotfix/1.5.1'