Merge branch 'hotfix/1.0.4'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:57:58 +0000 (14:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:57:58 +0000 (14:57 -0500)
commit7c1c87c9fc69b4f483dffe00591b9efb9d920b6a
tree012712e310c6b12718400474c93b30db7ead1d89
parentc5024015fb8854281cec04d2252b8815002158cc
parented7be25d70ab39ea20b39924e1d5b034884a0d77
Merge branch 'hotfix/1.0.4'