[php-horde-Horde-Translation/el6: 6/6] Merge branch 'master' into el6

[Nick Bebout]

commit e767779104a8a481832c8f40e8578f113ab73cd3
Merge: 21d01e5 ba079e8
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Dec 28 17:58:07 2012 -0600

    Merge branch 'master' into el6

 .gitignore                       |    2 ++
 php-horde-Horde-Translation.spec |   35 ++++++++++++++++++++++++++++-------
 sources                          |    2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)
---
diff --cc php-horde-Horde-Translation.spec
index f9e6f0c,9054fa5..86f993d
--- a/php-horde-Horde-Translation.spec
+++ b/php-horde-Horde-Translation.spec
@@@ -17,9 -18,8 +18,9 @@@ Requires(post): %{__pear
  Requires(postun): %{__pear}
  Provides:       php-pear(pear.horde.org/Horde_Translation) = %{version}
  BuildRequires:  php-channel(pear.horde.org)
 +BuildRequires:  gettext
  Requires:       php-channel(pear.horde.org)
- Requires:       php-common >= 5.2.0
+ Requires:       php-common >= 5.3.0
  
  %description
  Translation wrappers.