Merge branch 'hotfix/1.1.1' v1.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:49:26 +0000 (11:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 15:49:26 +0000 (11:49 -0400)
commit047d2183baf60b10cfab0239bba3172a1c3601a8
tree461770727dc5cb0c98fa6d98340d92cfc4e0f4ed
parent3b85f7994487f0c2ad29d6d804f2caf8c093c72e
parent6dd7100d4b6fdc6939a964d2ddd16a035102cd5a
Merge branch 'hotfix/1.1.1'