Merge branch 'hotfix/1.0.13' v1.0.13
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 21:19:15 +0000 (16:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 21:19:15 +0000 (16:19 -0500)
commit9b12126ba8f39d2f60c77b35fc281a53d1cea568
tree2a0ab2ac2c03c20d13c3bd3d1334d2b4159c3424
parentd66982f38a28be458b328769d97a3a7c2735f044
parent8834a27b12c6f9579b0976bdfca647b14ec1469c
Merge branch 'hotfix/1.0.13'