Merge branch 'hotfix/1.0.1' 1.0.1
authorIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:13:21 +0000 (15:13 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:13:21 +0000 (15:13 -0400)
commit82a78f2b39b1bdcfb5bbf0d0920e8973a72858dd
tree39c7366b4b01090f23f7ea2a9f8b9bdb149a068c
parentbaf8ed2dda8d82a1145e1dc633728c12c758b0b7
parentf1d6b4bed720adab552b0df1d1f3a5c4fcd39414
Merge branch 'hotfix/1.0.1'