Merge branch 'hotfix/1.2.5' v1.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:10 +0000 (14:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:10 +0000 (14:40 -0500)
commite18d8079c0b999c5e5574c46e97e75c5df65e4d5
treec9a6d4c05544bba88dd2ff78fbdcea9bcbfb45dd
parent45047cfd832842ed96007898f190ab7fc608a01b
parent392e92238d796551258ae535f29415ffa8873711
Merge branch 'hotfix/1.2.5'