[mongodb/epel7: 4/4] Merge branch 'master' into epel7

[Pádraig Brady]

commit 0e67d35147eac310e90ada5131ff371f66e0a664
Merge: 4d05203 e1d4245
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Mar 3 21:17:29 2014 +0000

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore

 .gitignore   |   20 +-----------
 mongodb.init |    2 +-
 mongodb.spec |  101 +++++++++++++++++++++++++++++++++++----------------------
 sources      |    2 +-
 4 files changed, 65 insertions(+), 60 deletions(-)
---