Merge branch 'f20' into f21

This commit is contained in:
Tim Waugh 2014-10-17 17:09:50 +01:00
commit f2e1932ab8

1
.gitignore vendored
View File

@ -248,6 +248,7 @@ pycups-1.9.51.tar.bz2
/system-config-printer-1.4.3.tar.xz
/system-config-printer-1.4.4.tar.xz
/system-config-printer-1.4.5.tar.xz
/system-config-printer-1.4.6.tar.xz
/system-config-printer-1.5.0.tar.xz
/system-config-printer-1.5.1.tar.xz
/system-config-printer-1.5.2.tar.xz