indeed, i only looked at the conflicting files on MoM ... merged manually now
** Changed in: shadow (Ubuntu)
Status: Incomplete => Invalid
--
please sync shadow 1:4.1.4.2+svn3283-2 from debian unstable into natty
https://bugs.launchpad.net/bugs/680042
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
