[plowshare/el6: 3/3] Merge branch 'master' into el6

[Elder Marco]

commit c32ea07d0b5991f6469abbba8a3b9c5919e6ce9b
Merge: 2c0db49 3c0ad25
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Jul 27 16:13:59 2014 -0300

    Merge branch 'master' into el6

 .gitignore     |    1 +
 plowshare.spec |    9 ++++++---
 sources        |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---