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

[Nick Bebout]

commit 45bed6dc7e97e476e24ba2a283e3af15f6dae96e
Merge: 7047285 200f29d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Jan 11 17:04:32 2013 -0600

    Merge branch 'master' into el6

 package.xml.patch         |   64 +++++++++++++++++++++++++++++++++++++++++++++
 php-horde-Horde-Date.spec |    7 ++---
 2 files changed, 67 insertions(+), 4 deletions(-)
---