Merge branch 'release/1.0' v1.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Jul 2014 20:25:33 +0000 (16:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Jul 2014 20:25:33 +0000 (16:25 -0400)
commit67a3c153709fac6d4a7a6d4de4daf053335d1fb0
tree963a444e8d4a189afb1289b8640f15d4e8139336
parentde8d62e2cf92c10b0c02774ffd70cf68b04eb9f2
parent5c67021507711dd9ee8a5d7d4fed1285bcd85ac3
Merge branch 'release/1.0'