Merge branch 'hotfix/1.1.4' v1.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:49:12 +0000 (09:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:49:12 +0000 (09:49 -0400)
commit5a35abcdb750abcb42db673338e3a7a57b649cd0
treef9e37288fc70f4fd8851af29b7d7ba032356aac0
parent18c01e796db1f4de9ebb5da2f85e8c61a90145de
parent78a4e6fc02dcb2bffbad5a251cd4b0d43c6f1946
Merge branch 'hotfix/1.1.4'