# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1378110574 -3600
# Node ID c4837ed2eeb156e8941347a1d7d70b9638cba799
# Parent  592ac92002a8b66ed8a420441b93cf948d41bec6# Parent  edad8a88a0749d79a8fdd44bf906455dd5b9dd1b
Merge mepd_new_params branch