Merge branch 'hotfix/1.1.5' v1.1.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 20:49:39 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 20:49:39 +0000 (16:49 -0400)
commit6652cba45c76ee0856dc21e4bd4551f18fa46c41
tree873b6a8a5f451c943d7521c2a532bff47d4364bd
parent62bc7200b3f7057d28415b25d84fc10262d34461
parent9ba7839bede070a66f5da2a6bcb9c39e3c4b4d0f
Merge branch 'hotfix/1.1.5'