[ddclient/el6: 8/8] Merge branch 'f16' into el6

[Jon Ciesla]

commit 6b22abf36e5fe8ddc89e9f15a1e279e13faadcc0
Merge: c5c2888 0bf1ae4
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Mar 29 07:12:37 2012 -0500

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

 .gitignore    |    2 +-
 ddclient.spec |   15 ++++++++++++---
 sources       |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 6d46518,b5e08cd..1f60290
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--ddclient-3.8.0.tar.bz2
+ /ddclient-3.8.1.tar.bz2