# HG changeset patch
# User Chris Cannam
# Date 1403186304 -3600
# Node ID 88a8f4ea0a56ccc5a693cd2ed1cc11c2de94888a
# Parent  7b1b6cbfa075bcf195f9d1e5ddbb3777b8ee579e# Parent  9e2fc89740c47c0bce47d23aad3794b91245caf9
Merge from default branch

diff -r 7b1b6cbfa075 -r 88a8f4ea0a56 plugins/makers/qm-logo.png
Binary file plugins/makers/qm-logo.png has changed
diff -r 7b1b6cbfa075 -r 88a8f4ea0a56 plugins/makers/qm.png
Binary file plugins/makers/qm.png has changed