Viewing all changes in revision 4797.76.1.
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-10-08 11:02:47 UTC
- mfrom: (4797.58.21 2.1.4-dev)
- mto: (4797.82.1 2.1.4-dev) (5050.50.1 2.2.2-dev) (5609.33.5 2.3) (6015.55.2 2.4-feature-flags)
- mto: This revision was merged to the branch mainline in revision 5524.
- 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
