Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 14:57:02 +0000 (10:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 14:57:02 +0000 (10:57 -0400)
commitccfa4de4c90529601e81a43222eca58f8ec3b2e2
tree7be1b782958ba35778d63deb595f1cc54436d1cb
parent59fc4e50bd803b38e9ba9fe2328d09b1ba4965e9
parent99f69e82568d4f5a7087a7488e16883cd2c210dd
Merge branch 'hotfix/1.0.2'