Merge branch 'hotfix/1.2.23' v1.2.23
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:15:52 +0000 (13:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:15:52 +0000 (13:15 -0500)
commit10b2bd7da4bbdb57aaa33c4dac7b675c1931092e
tree7bc79856a61cb33ada09b2ef2ed6e156b314177f
parente66d444f20ded3d3d3e3abdd3a1389aa7bfa8d64
parent4fc8d94f5ce3e98deab199dd4f8e0ed17a8f7e0f
Merge branch 'hotfix/1.2.23'