commit 831d112c6dd4ebeb13d9ab7492616059c184f0e9 Merge: 66b8957 d052859 Author: Elder Marco <eldermarco at gmail.com> Date: Sat Jun 9 10:12:18 2012 -0300 Merge branch 'master' into f15 .gitignore | 1 + plowshare.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---