Merge branch 'hotfix/1.5.23' v1.5.23
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Apr 2016 17:59:32 +0000 (13:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Apr 2016 17:59:32 +0000 (13:59 -0400)
commitc3d92093e292269e2854b6df38670f00582dec8a
treec8011813f34f1140e3f9968319dd71ab75715dd3
parentc3baffa0eb33825ff83937a5526a92215a746cf8
parent9396b793b87845f48bbacbe8a7efb0be9385cdb6
Merge branch 'hotfix/1.5.23'