[ddclient/el5: 19/19] Merge branch 'el6' into el5

[Jon Ciesla]

commit efc84fb64739beb5cf8584d89236e01c9eeb7f45
Merge: dec6e7d 6b22abf
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Mar 29 07:14:38 2012 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	ddclient.spec
    	sources

 .gitignore    |    2 +-
 ddclient.spec |   15 ++++++++++++---
 sources       |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---