Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 21:55:30 +0000 (16:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 21:55:30 +0000 (16:55 -0500)
commite44def2058d5e163c099f00f792d3156ea137760
tree23360c989680b25d9f2c1fd0eb7d745beb0002f7
parent6c3e89ac5c25fa926182f0ffaf718439651dfea4
parent2588297863eb02d7857d52add4a3c1445b8da833
Merge branch 'hotfix/1.1.3'