Merge branch 'hotfix/1.2.24' v1.2.24
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:43:25 +0000 (13:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:43:25 +0000 (13:43 -0500)
commite896946fbf540eb5250ac46eaedfa3e4bb60710f
tree690cc63ec452c7fd97654116f0acc643e3c7f2d4
parent10b2bd7da4bbdb57aaa33c4dac7b675c1931092e
parent7030df7f621a42fe862bfcc0dcd6e917a7df5b0c
Merge branch 'hotfix/1.2.24'