Merge branch 'hotfix/1.0.11'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Oct 2015 19:14:14 +0000 (15:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Oct 2015 19:14:14 +0000 (15:14 -0400)
commit427c9326d86f647bec43ca7a8cec79cb2e6d953a
treeb5e19a8c8117ad05873296fbf18676d286706a8a
parent58272f8a3bb8748cd861a47d064850c4831efd5a
parentaa982d065c4a33951bca3818fcc2675751504f9e
Merge branch 'hotfix/1.0.11'