Merge branch 'hotfix/1.1.24' V1.1.24
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 17:59:00 +0000 (12:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 17:59:00 +0000 (12:59 -0500)
commitb0ae12c119dc3c30fb98d1af94b12b01397adbc4
tree9220c3fd109af197d0b4905930094d295b67645d
parent13e9d0243742ed5bd693dfa2b80e5dc294849001
parent232fe1e3e6031d301b6282f672f32192674c9622
Merge branch 'hotfix/1.1.24'