From: Peter Palfrader Date: Thu, 10 Jan 2008 14:33:50 +0000 (+0100) Subject: A nop with something behind it. X-Git-Tag: userdir-ldap-0.3.16~14 X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=2ead5ad6dad3a94f61363bfd1d847a8e595ba681 A nop with something behind it. Merge in r361 from alioth-common, the shiftUID patch, but also cherry pick r377 which reverts it (because it's incomplete/broken). This is necesary because bzr tracks what you merged so far and would always want to pull in 361 if I just skipped it now. --- 2ead5ad6dad3a94f61363bfd1d847a8e595ba681