Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:37:40 +0000 (16:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:37:40 +0000 (16:37 -0400)
commit216bdcb4ec007a1ab5c807ae1022b599d4666887
treed77cf95038814882093a869892c19f603cbb7f1e
parent07940219a094b4c14bc49529aa96a5bb2ec7a441
parente7ca8d4afea77162ba722fc00e7916798bd3c351
Merge branch 'hotfix/1.1.11'