Merge branch 'hotfix/1.1.7' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 20:24:33 +0000 (16:24 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 20:24:33 +0000 (16:24 -0400)
commit3941098718684d9924a472f8f41e26c099c13e0d
tree7b3467ce878a3a594433ab6c9311ea6558fb9fac
parent1db2a424019a251cfc7f3d810352a6c7c69ccf55
parent95f19e9a2fc564f0d91db91e4f9c03a46deeee28
Merge branch 'hotfix/1.1.7' into develop