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

[Elder Marco]

commit 37f8d310049a1fde498732335f35bd1c07763f46
Merge: 8efcd2e e20f054
Author: Elder Marco <eldermarco at gmail.com>
Date:   Thu Apr 10 19:27:52 2014 -0300

    Merge branch 'master' into el5

 .gitignore     |    1 +
 plowshare.spec |   49 +++++++++++++++++++++++--------------------------
 sources        |    2 +-
 3 files changed, 25 insertions(+), 27 deletions(-)
---