On Sat, 2011-09-10 at 12:45 +0000, Niels Thykier wrote: > The following commit has been merged in the squeeze branch: > commit 9bcbd856565b71a926187e1357661ffe0a552967 > Author: Niels Thykier <niels@thykier.net> > Date: Wed Aug 17 15:30:33 2011 +0200 [...] > Conflicts: > > checks/conffiles > debian/changelog Anything to worry about? Regards, Adam