Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 15:43:43 +0000 (11:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 15:43:43 +0000 (11:43 -0400)
commit8ffff1af8fb8f956fba4cfd6f8c8f2c4dc8f3d5a
tree96c64a85f21d9f13db13fefe89daab58d0edb1c9
parent28445ee15708af1a3be36d94eef7c0b7149ebbdf
parentc2671df68014339380dfb919338807d4abb292df
Merge branch 'hotfix/1.1.3'