Merge branch 'hotfix/1.1.5' v1.1.5
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:09 +0000 (15:19 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:09 +0000 (15:19 -0400)
commit13a6a9ff3f28bff7ef1e6b81f40c341354425186
treeb735c0809816a1e1a5383a5a26e9e790cf9e0830
parent7ee97713ff40f61cd3127e1dc9cbb67f9c852641
parent74b8b225b15bd383bebc3b6378b850fda6eafbaa
Merge branch 'hotfix/1.1.5'