Merge branch 'hotfix/1.5.5' v1.5.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 19:03:34 +0000 (14:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 19:03:34 +0000 (14:03 -0500)
commitd51b580598ce9e6a6e3fac864641081df6dac9d8
treec8c7b0709680c5996a9dd50de267666bedacb53d
parentfd14db94b08410528475d72f9dd4e7593e930303
parent93f9a6c33b345fa58b37d56d69da422c662995f5
Merge branch 'hotfix/1.5.5'