[php-horde-Horde-Date/el6: 2/2] Merge branch 'master' into el6

[Remi Collet]

commit ab9747e59c5bee43020819b4b803591e312560da
Merge: c11a0e2 7ca156a
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Mar 7 13:19:29 2013 +0100

    Merge branch 'master' into el6

 .gitignore                |    1 +
 php-horde-Horde-Date.spec |   29 +++++++++++++++++++----------
 sources                   |    2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)
---