Merge branch 'hotfix/1.4.8' v1.4.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 May 2015 16:29:55 +0000 (12:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 May 2015 16:29:55 +0000 (12:29 -0400)
commit7a05cb6ec4b71ab4c78ec78f1174c95b9d5f09cb
treea9a8bbcfda63d7e5defda5e651e66317cdf5b911
parentb87ff9709c0f2834aa5c0738f977cc9e4047aed5
parent6bff24b7a392eaf521e6ea0e394cd64929eacf05
Merge branch 'hotfix/1.4.8'