[sssd/f14/master: 2/2] Merge branch 'master' into f14

Stephen Gallagher sgallagh at fedoraproject.org
Wed Jan 12 12:46:27 UTC 2011


commit 7d665d25e4d74612193397479465c09c0473a2d7
Merge: 8789804 3a15e92
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jan 11 12:33:21 2011 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	sssd.spec

 ...Validate-user-supplied-size-of-data-items.patch |  294 ++++++++++++++++++++
 sssd.spec                                          |    7 +-
 2 files changed, 300 insertions(+), 1 deletions(-)
---


More information about the scm-commits mailing list