Merge tag 'v1.0.5' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Jun 2016 14:39:06 +0000 (10:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Jun 2016 14:39:06 +0000 (10:39 -0400)
commitfb72bfae88ef934c90cdf8b4acad6625e7ba1255
tree726f37291e889d7e7a0db3ff85ead3a961629020
parent44a87215bfff93df111ba3d9cd9e4308e5413f58
parent183f538ae0ab5d664c60d2e62f89ae033d38fac1
Merge tag 'v1.0.5' into develop

small change to merge previous push onto master