Merge branch 'hotfix/2.0.5' v2.0.5
authorlaury <laury@gaslightmedia.com>
Fri, 3 Jun 2016 19:09:34 +0000 (15:09 -0400)
committerlaury <laury@gaslightmedia.com>
Fri, 3 Jun 2016 19:09:34 +0000 (15:09 -0400)
commit3f0fe06a14a4fccadeac88496c1ddfb9d288ae94
tree53ab05f18a617ac6f9849c13af95bdb82e79f243
parentaefc51b25c4ac90f682c298e3e894b4858b397ba
parent7b699207be4ecbd3d4e65dd1053653d555cf36fd
Merge branch 'hotfix/2.0.5'