Merge branch 'hotfix/1.1.32' v1.1.32
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 May 2015 17:02:29 +0000 (13:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 May 2015 17:02:29 +0000 (13:02 -0400)
commita9b17f2d5a2874651f9e450d1d50a5e8b2434957
tree77cb92c5719c9575ec4f76fad6b884930c3c4b63
parent12d2d74236dcf2c45659a8659909c8a02f071d73
parent6082c235ba18d1c70117890d551437c6e5439938
Merge branch 'hotfix/1.1.32'