Merge branch 'hotfix/1.1.14' v1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:00 +0000 (11:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:00 +0000 (11:49 -0400)
commit0c7a2d4211797fec60d184306f98eafab6416b1d
tree6dca4c318f38ba28a2432ddff4a940cb6c3dc61f
parent1c74e7d658965c21610936474765c77151eeaed4
parent5540495279688c448970324603863acb8f2b8b20
Merge branch 'hotfix/1.1.14'