Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 18:11:43 +0000 (14:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 18:11:43 +0000 (14:11 -0400)
commit8e13b4eb31b6a206b26870a3e26739c42cb0cb17
tree476e974244c96b72bfb33a42410e60a0e50025aa
parenta181f2d3a29ba403e402779f6099453624bf865a
parentc8266cd0df5dd784c6353027aa17e42899bbc0d7
Merge branch 'hotfix/1.0.11'