Merge branch 'hotfix/1.1.95' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 14:30:56 +0000 (10:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 14:30:56 +0000 (10:30 -0400)
commit37ceef2f33328c04276f61ea969111fc873c1729
treec266aa0a321abc8afcfbd2fab4e5ea3c81d46210
parentbcb67f114d220e5d13f8d9d9e7efe3d41ab30ab2
parent2b6895d88a2e736acf1adecb2105d8c0e7974366
Merge branch 'hotfix/1.1.95' into develop