[polkit/f14/master: 3/3] Fix merge conflicts

Matthias Clasen mclasen at fedoraproject.org
Wed Aug 18 18:43:26 UTC 2010


commit 86f7c65256239020b8127c699565f4b733d3d724
Merge: c1967a3 63764f0
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 18 14:41:37 2010 -0400

    Fix merge conflicts

---


More information about the scm-commits mailing list