commit 1202330f103fc33d1cf257370242535ab9a9583f
Merge: a23b484 8c7f4d7
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Sat Feb 4 20:24:10 2012 +0100
Merge branch 'f15' into el6
.gitignore | 4 ++--
pure.spec | 5 ++++-
sources | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
---