commit 2b07f0797623f7f50e6c71e830560ceb68b99b1a
Merge: 6124b0d f2a174f
Author: Robert Scheck <robert(a)fedoraproject.org>
Date: Fri Dec 31 23:23:52 2010 +0100
Merge remote branch 'origin/master' into f13
Conflicts:
.gitignore
.gitignore | 2 +-
lzop.spec | 63 ++++++++++++++++++++++++++++++++---------------------------
sources | 2 +-
3 files changed, 36 insertions(+), 31 deletions(-)
---