Merge branch 'hotfix/1.4.5' v1.4.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:51:02 +0000 (15:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 20:51:02 +0000 (15:51 -0500)
commitdb112f0368dbb57e5aefefbb12d27a6ab4faeae2
treee92c47ec3d6fc09e0e969b814d37094059515773
parent88d282bcabb853d8ce0f9495abcad96813f35e1f
parente28ded320d0b31266a32575868b12c0f0486af6c
Merge branch 'hotfix/1.4.5'