Merge branch 'hotfix/1.2.6' v1.2.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:54:48 +0000 (16:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:54:48 +0000 (16:54 -0400)
commitae23be5d9665a0bc8f2bfa312e161b6e26643223
treed69605541dc968080c92d37dfa9f1b002f33e31d
parent0e9dfede44af8ca65d688c416d0ed138a9abc3ed
parent7bae35171942943d4b4f6571c5d695ecc1988019
Merge branch 'hotfix/1.2.6'