[php-ZendFramework/el6: 3/3] Merge remote-tracking branch 'origin/master' into el6

[Felix Kaechele]

commit 821d23cec5e12495d4cd8607f6fe66502bd443b6
Merge: 8533b7c 1905a25
Author: Felix Kaechele <felix at fetzig.org>
Date:   Thu Oct 4 16:51:16 2012 +0200

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore             |    1 +
 php-ZendFramework.spec |  274 ++++++++++++++++++++++++++++++++++++++++--------
 sources                |    2 +-
 3 files changed, 232 insertions(+), 45 deletions(-)
---