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

[Elder Marco]

commit eceda1bd15cd86fd3f2669fe4f11bc1ee5d22f49
Merge: 53f0c78 c245181
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed Sep 4 19:29:26 2013 -0300

    Merge branch 'master' into el6

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