Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:57:29 +0000 (17:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:57:29 +0000 (17:57 -0400)
commit6ba0cc2027cbef42505da9a1ed13505a0f0ce65b
tree8caf7a02c584ee43256996be2be91926376d51d2
parent749d6b9e27df32ee35d31d1043a3d584a069835f
parent779be3bef03895219288ccb81396a8c3240e53a1
Merge branch 'release/1.0.5'