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

[Elder Marco]

commit 61767019a3970e1cc35d15c8a0eb965567bdf7f0
Merge: 73d9054 8d3958e
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Aug 10 16:12:17 2013 -0300

    Merge branch 'master' into el5

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