Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:03:52 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:03:52 +0000 (12:03 -0400)
commit4a90a9dac809112f0aeca2f6f7162f339c37b88e
treee33b879439ce1cd12cea86568af763e0a4b81e59
parent7dc8a0b7325ef1bc57059c850425d4e7a8418928
parent00746a4a9bffa4121ad18fa52fb68274c0647e1e
Merge branch 'hotfix/1.0.6'