commit 9d14db6c58d879b6efa3422cc2cc6f06ab0dcecb Merge: 15930da 31133ae Author: Peter Gordon <peter at thecodergeek.com> Date: Wed Oct 13 20:33:51 2010 -0700 Merge branch 'master' of ssh://pkgs.fedoraproject.org/deluge ---