Viewing all changes in revision 2316.
- Committer: Canonical.com Patch Queue Manager
- Date: 2007-03-05 22:58:59 UTC
- mfrom: (2120.7.7 autoconflicts)
- Revision ID: pqm@pqm.ubuntu.com-20070305225859-31c72fc6c3778b82
resolve auto-resolves text conflicts by default
expand all
collapse all
added
removed
