commit f1b721e4758fb0f1bb1e4835650b4818bb03836d Merge: 700da20 a8dc820 Author: Christof Damian <christof at damian.net> Date: Sat May 25 12:31:27 2013 +0200 Merge branch 'master' into el6 .gitignore | 1 + php-pecl-mongo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---