Commit Graph

3 Commits

Author SHA1 Message Date
Tim Waugh
2568000642 Merge branch 'f19' into f20
Conflicts:
	cups.spec
2013-11-14 18:14:23 +00:00
Tim Waugh
7e2a5812e7 Merge branch 'f18' into f19
Conflicts:
	cups.spec
2013-11-14 18:09:23 +00:00
Tim Waugh
c994ebe40f Avoid stale lockfile in dbus notifier (bug #1026949).
Resolves: rhbz#1026949
2013-11-14 17:58:25 +00:00