Viewing all changes in revision 5050.73.3.
- Committer: Canonical.com Patch Queue Manager
- Date: 2011-05-17 11:19:41 UTC
- mfrom: (5050.75.1 2.2.5-dev)
- mto: (5609.43.1 2.3.4-dev) (5050.77.1 2.2) (6024.3.1 integration) (6012.1.1 trunk) (4797.94.3 2.2-feature-flags)
- mto: This revision was merged to the branch mainline in revision 5885.
- Revision ID: pqm@pqm.ubuntu.com-20110517111941-nrx9u4z1q8laajwp
(vila) Merge 2.1 into 2.2 resolving conflicts (Vincent Ladeuil)
- files modified:
- NEWS
expand all
collapse all
added
removed
