# HG changeset patch
# User Chris Cannam
# Date 1377774796 -3600
# Node ID c28ce1a71a2238a79b5c406db3f26b5eb0df90ae
# Parent  2f4c076ed281c8575ebc7053ed545a6de1f678c4# Parent  a2e51c0a78608833203a2691a51995c1596cdb67
Merge from branch "luisf"