commit 4ebcf0cd88480cc3c1de89e81d1346258cf6663e Merge: 9dbf812 5f02290 Author: Jeffrey Bastian <jbastian at redhat.com> Date: Wed Oct 16 08:51:04 2013 -0500 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-tftpy ---