Merge branch 'hotfix/1.3.12' v1.3.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 21:15:32 +0000 (16:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 21:15:32 +0000 (16:15 -0500)
commit0577d1b63a990de77d6f339f89fe62a15ddc4668
treedacf64cd71f8748cb3afa56d376f0c22db91df8f
parenta1725927909c4a04b144f9c7a6daee0327a89a98
parentdb7470ed2422419be42889f0559cd4a7fdf3f8b1
Merge branch 'hotfix/1.3.12'