Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 17:07:51 +0000 (13:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 17:07:51 +0000 (13:07 -0400)
commite0563940117cf1ad0c6604c7a5e560080dac8d97
tree82aa49c3697f25acfdf95931d81b98be48b3a048
parent2aeb42cfc1000b8c33b0d17ca68a86edc8a74f4f
parent99b1e241a5c0ad76b478f97c2f0fd6c0533c5af3
Merge branch 'hotfix/1.2.1'