Viewing all changes in revision 12366.6.13.
- Committer: Gary Poster
- Date: 2011-02-16 03:22:26 UTC
- mfrom: (12366.8.1 bug164196-2)
- mto: (7675.1045.32 launchpad)
- mto: This revision was merged to the branch mainline in revision 12533.
- Revision ID: gary.poster@canonical.com-20110216032226-g049o2ytg1gjjfk3
commit changes from parent branch, with conflict resolution
expand all
collapse all
added
removed
