Merge tag 'v1.1.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:54:46 +0000 (14:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:54:46 +0000 (14:54 -0400)
commit52c7e17f23f7e167d28af9764ae7caf988549ef1
treee168eaaa3c8588dd8f659ed54929eec10cd8723a
parentbf8fe4787ee1af99f51419c995ecfb8dee232bc2
parentee3883a802902b5b5b1b4e2082932b7f1f4cf621
Merge tag 'v1.1.7' into develop

v1.1.7