Merge branch 'hotfix/1.1.6' V1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:29:08 +0000 (17:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:29:08 +0000 (17:29 -0500)
commit6f7cc7404e849f8cbb66f2d2153c8d9c45be4910
treeac576976aa2e751fb7dc0221b36d424b343b8cec
parentfe766cb35bb458bd8f377e83a6b0533c1263dca5
parent4431420acad7b840363568a2c903a728a0d0d0ae
Merge branch 'hotfix/1.1.6'