commit 30db871116760d477e10708ff5bfd3d9708234be Merge: f44ee7e e8bd09e Author: Eric Smith <brouhaha at fedoraproject.org> Date: Sat Feb 14 20:51:01 2015 -0700 Merge branch 'master' into epel7 .gitignore | 1 + snapraid.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---