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

[Elder Marco]

commit 7ecfd7ac088b593d3117cb172b379308e1e25e93
Merge: 98c1117 8dc08fe
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Jan 27 12:50:33 2013 -0200

    Merge branch 'master' into el6

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