Merge tag 'v1.1.5' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:36 +0000 (15:19 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:36 +0000 (15:19 -0400)
commit4266714b557164155bbd7a38723fd0831a4d415c
treeb735c0809816a1e1a5383a5a26e9e790cf9e0830
parent0b16906b8b714a38a047bedefa71c6a4a6640901
parent13a6a9ff3f28bff7ef1e6b81f40c341354425186
Merge tag 'v1.1.5' into develop

version 1.1.5