Merge branch 'hotfix/1.3.2' V1.3.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 16:01:14 +0000 (12:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 16:01:14 +0000 (12:01 -0400)
commit74fe36f7338b13b0ab1208df15286e0338923104
tree15393da734a123910c3bc3bcaffc5dd42e232100
parent4c3b022e71c37d0a52160b1ed64c45fea9816b56
parent17530c226da3360f411b87445e94cc0c7e931e6e
Merge branch 'hotfix/1.3.2'