commit a011e0573281ddceacaa80fd96208a41eed2c1d0 Merge: f51c9f7 8f33062 Author: Elder Marco <eldermarco at gmail.com> Date: Sun Mar 11 10:41:43 2012 -0300 Merge branch 'master' into el6 .gitignore | 1 + plowshare.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---