Merge branch 'hotfix/1.1.5' v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:30:00 +0000 (14:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:30:00 +0000 (14:30 -0400)
commit90b8e5e5b8728f29ed0645c96b23cac21b979305
treeffb55e84ad20d5975df934b052145aa5c553fab0
parentbedb0584d72be9ed056b4cbcf700ed916d3a3306
parent6c6564897cd391689e5548a08a53886105f67a8d
Merge branch 'hotfix/1.1.5'