Viewing all changes in revision 4867.
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-10-08 11:02:47 UTC
- mfrom: (4866.1.1 2.1.4-dev)
- Revision ID: pqm@pqm.ubuntu.com-20101008110247-f1pwblmyob53ae6f
(vila) Merge 2.0 into 2.1 resolving conflicts (Vincent Ladeuil)
expand all
collapse all
added
removed
