Merge branch 'hotfix/1.2.8' v1.2.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 15:01:47 +0000 (11:01 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 15:01:47 +0000 (11:01 -0400)
commitc80474ed31f2b5d16ff2e24f711b2f754fa34f5d
treefdf881368498b36248f57e2bff21da9470f50a5a
parent685d808b0f68fb8b28489e1679c6ce1ef062e968
parentc471888de71f267fff56c18c16635327accce00f
Merge branch 'hotfix/1.2.8'