commit a9cf40cd7bcc0892779a875c9574ca8cb1b41668
Merge: 92dc7c8 a448e5f
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Fri Jan 7 11:05:04 2011 +0100
Merge branch 'f13' into f14
.gitignore | 1 +
cups-page-label.patch | 10 +++++-----
cups.spec | 7 +++++--
sources | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
---