Merge tag 'v1.1.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:06 +0000 (11:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:06 +0000 (11:49 -0400)
commita9c8fa71aab93980a1956876f607f00e127ce527
tree6dca4c318f38ba28a2432ddff4a940cb6c3dc61f
parent891f9483abba89af999da2cb42b80979c54ac798
parent0c7a2d4211797fec60d184306f98eafab6416b1d
Merge tag 'v1.1.14' into develop

v1.1.14