commit 47e43dabdeaf4e9e63acdba5fc2e7e0a8ab175c6 Merge: 97059b9 f81cbf1 Author: Ismael Olea <ismael at olea.org> Date: Mon Sep 16 22:33:50 2013 +0200 Merge branch 'f20' of ssh://pkgs.fedoraproject.org/chromaprint into f20 ---