Merge branch 'hotfix/1.5.5' v1.5.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:19:33 +0000 (11:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:19:33 +0000 (11:19 -0500)
commit2258706b179966533b27b4cb45bda6b947086a49
tree8e319aca3d164f246f66841248811eecdc9c18f7
parent7c7d16203dfe5f00ee08466850c0e68bf251d5b4
parentd5bdd488c63037aebcbf506353a49b7bc29fd930
Merge branch 'hotfix/1.5.5'