commit 570eeb1d0b16bdebf3aed4f2e7ec93fb32fe0284 Merge: 0f8bf33 eb1d763 Author: Jared K. Smith <jaredsmith at jaredsmith.net> Date: Sun Oct 26 14:59:47 2014 -0700 Merge branch 'master' of ssh://pkgs.fedoraproject.org/pjproject ---