[php-ZendFramework/f13: 2/2] Merge remote-tracking branch 'origin/master' into f13

[Felix Kaechele]

commit e660466f9b8645d77d260c9a1f29fb1f27ee50f9
Merge: e9b60e3 e6b4274
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sun Jun 12 10:00:48 2011 +0200

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

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