Merge branch 'hotfix/1.1.7' v1.1.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:54:41 +0000 (14:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:54:41 +0000 (14:54 -0400)
commitee3883a802902b5b5b1b4e2082932b7f1f4cf621
treee168eaaa3c8588dd8f659ed54929eec10cd8723a
parentf0ae5b23e15b693f7d379eaa4958679064215a2d
parent31a4f6ad8bf54bb631a40f202ca549430248e5da
Merge branch 'hotfix/1.1.7'