Merge branch 'hotfix/1.1.15' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Jul 2015 14:51:04 +0000 (10:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Jul 2015 14:51:04 +0000 (10:51 -0400)
commit398d3512dc39c6aec2fabd83bdc75f9da073d963
tree60ba4d17e8477e17409ad08377b8e863b321162c
parenta9c8fa71aab93980a1956876f607f00e127ce527
parent5023c1b3a80bfdc8b9f7091700d0650534da384c
Merge branch 'hotfix/1.1.15' into develop