Merge branch 'release/1.6.26' v1.6.26
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:17:47 +0000 (14:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:17:47 +0000 (14:17 -0400)
commit236847d5ed18ff18f8d2b5ce879a192574baa271
treed08154905cba51c208ead7db9d7366ff208e3b9d
parent2af48ca04927b7b2121aadf6ec8c81ee13a40d6b
parent0e05ebbd1899405f3f3f4c3487b1ff5cc4c695bb
Merge branch 'release/1.6.26'