Merge branch 'master' of ssh://alikins@git.fedorahosted.org/git/certmaster
authorAdrian Likins <alikins@redhat.com>
Sat, 21 Feb 2009 05:39:32 +0000 (00:39 -0500)
committerAdrian Likins <alikins@redhat.com>
Sat, 21 Feb 2009 05:39:32 +0000 (00:39 -0500)
commit907668bd5063ebf8c4e2c11abcbd6cb46880808d
tree26b9cfcfde333b22e1524b015d18ec219c1dfaa9
parentd0bee2210b885bd8269e5ada00ccf12ed6f9b049
parenta900ddc0bc93714a22d219623bf65d6ac10be71f
Merge branch 'master' of ssh://alikins@git.fedorahosted.org/git/certmaster

Conflicts:
Makefile
Makefile