Merge tag 'v1.1.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 19:04:29 +0000 (15:04 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 19:04:29 +0000 (15:04 -0400)
commit77e36422c5fc2f51ef016bd90f91c4b74149fb20
tree54d6ce41da47af3247ac43b02574b817d7e17c47
parentd5fcdbcd145c4361ff0f4136b9f96ef322ad741a
parentfbe056466feec0eaa6f931ff2da35f07e14eec76
Merge tag 'v1.1.4' into develop

version 1.1.4