Merge tag 'v1.1.12' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:12:12 +0000 (14:12 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:12:12 +0000 (14:12 -0400)
commit6441c5fc2c9077b71381c029a3bc111282cb4096
tree1cf03ad1978ae0e347fe4d9b178b50cec19c5785
parentf97cb799fc5c4591ba225f6f112bc7f78faca621
parentbf61a7819a617ec8b3dcfc94e19a01f28d578d22
Merge tag 'v1.1.12' into develop

version 1.1.12