commit f81cbf13f012af8ef02ffbad3b547bfcdff0ce82 Merge: aedcb94 7a3068a Author: Ismael Olea <ismael at olea.org> Date: Mon Sep 16 22:26:54 2013 +0200 Merge branch 'f20' of ssh://pkgs.fedoraproject.org/chromaprint into f20 ---