[horde/el6: 3/3] Merge branch 'master' into el6

[Nick Bebout]

commit 30f4cda382a940778788ec8516c21733dcb012f0
Merge: 9246f1c 8a72c4e
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Aug 13 19:56:11 2011 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 horde.spec |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 4160b4a,eee20e4..55b7e46
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,2 @@@
 -horde-3.3.8.tar.gz
 -/horde-3.3.9.tar.gz
  /horde-3.3.11.tar.gz
+ /horde-3.3.12.tar.gz