Merge branch 'hotfix/1.4.1' v1.4.1
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Apr 2015 18:14:53 +0000 (14:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Apr 2015 18:14:53 +0000 (14:14 -0400)
commit4a4bf2287691b21eba9e47fb233b2cd69857d388
treee4be6ae6a3664c0c1ea7ff4f56e9f57d58305143
parent007050e92efa5b360cc3a5d27ca63aa8086aa0e3
parent4315f91a2c107c5ce02b94a332da921c3f333f23
Merge branch 'hotfix/1.4.1'