[php-ZendFramework/el6: 2/2] Merge branch 'master' into el6

[Felix Kaechele]

commit f496af9a78f3618caba4c4908c95d3e3b370614c
Merge: 821d23c 73fddce
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Thu Dec 27 16:36:02 2012 +0100

    Merge branch 'master' into el6

 .gitignore             |    1 +
 php-ZendFramework.spec |    8 +++++++-
 sources                |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---