[php-pecl-mongo/epel7: 2/2] Merge branch 'master' into epel7

[Remi Collet]

commit b183409dc59a316dc76d56cc5ea9f9cc8b61097d
Merge: e6280ed 7d91188
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Apr 4 13:18:44 2014 +0200

    Merge branch 'master' into epel7

 .gitignore          |    2 +
 mongo.ini           |   35 ++++++++
 php-pecl-mongo.spec |  239 ++++++++++++++++++++++++++++++++-------------------
 sources             |    2 +-
 4 files changed, 189 insertions(+), 89 deletions(-)
---