Timestamp:
Nov 23, 2011, 4:14:00 PM (14 years ago)
Author:
andersk
Message:
Merge r2072:2073 from trunk/locker to branches/locker-dev/locker

This is effectively a noop, but contains a different conflict
resolution for the svn:mergeinfo property on locker/bin/crontab in an
attempt to restore sanity and avoid future conflicts.

Ha.
Location:
branches/locker-dev/locker
Files:
2 edited

Note: See TracChangeset for help on using the changeset viewer.