Merge branch 'hotfix/1.0.26' v1.0.26
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Oct 2016 17:21:08 +0000 (13:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Oct 2016 17:21:08 +0000 (13:21 -0400)
commit108a85d98b1ef90f9bdd0477d7bbb5df96dce7cc
tree3cff99dc2b5765a9f5f168a8dcbfc5d9762b7390
parentb8830fb47233a9b350ad730ad8f3b6c9e73f50c2
parentd2bbd8ed8107ff819576b494e240bc78c68679fd
Merge branch 'hotfix/1.0.26'