Viewing all changes in revision 4449.120.1.
- Committer: Jonathan Lange
- Date: 2009-07-20 11:27:05 UTC
- mfrom: (4449.82.6 1.17)
- mto: (4449.1.105 +trunk)
- mto: This revision was merged to the branch mainline in revision 4497.
- Revision ID: jml@canonical.com-20090720112705-ss4o5s3zw3dbxsek
Merge 1.17, resolving conflicts.
expand all
collapse all
added
removed
