Merge branch 'hotfix/1.1.7' v1.1.7
authorIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 20:24:17 +0000 (16:24 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 20:24:17 +0000 (16:24 -0400)
commit46437f1a41fb13b97931f05e594c29c6345fd05f
tree7b3467ce878a3a594433ab6c9311ea6558fb9fac
parent567df496d29731ad7f5e9a2d8754b6df0d6ec908
parent95f19e9a2fc564f0d91db91e4f9c03a46deeee28
Merge branch 'hotfix/1.1.7'