Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:41:58 +0000 (16:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:41:58 +0000 (16:41 -0400)
commit5a8e9f93e4291b0a47ee9c85f3ec675fa339fd58
treefbc376f90441cabdd41c6ac7384d27460374eeb3
parent5a32f8f51f94a128d88019403495eb685993a223
parent586559d86ea74f23830f6447be4e7b9329d2122c
Merge branch 'hotfix/1.0.18'