Merge branch 'hotfix/1.0.40' v1.0.40
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 13:27:16 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 13:27:16 +0000 (09:27 -0400)
commit77458e2be9572f0c7689d1721ae49b509d097cfb
tree0faccdd3d0442296ffcfeb16f25f00c319b7646a
parent36f975ef28194466cba9eaabffcf36be82367cd9
parent0c83175b5da83ad84acb902c312d82a7a4c1bccb
Merge branch 'hotfix/1.0.40'