Merge branch 'hotfix/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Dec 2014 16:34:02 +0000 (11:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Dec 2014 16:34:02 +0000 (11:34 -0500)
commit1f599b9fb0ac7a20436efc1145f2918bd8825398
treed4460550f884c0a14c56f49ea4fc3af839c2346d
parent46437f1a41fb13b97931f05e594c29c6345fd05f
parentd2a4d7755df1bcb4ecb18f4c445828b488c1fd99
Merge branch 'hotfix/1.1.8'