Merge proposals dependent on lp://staging/~leogg/ubuntu-desktop-course/ubuntu-desktop-course-spanish

1. ubuntu-desktop-course-spanish
2. Dependent merge proposals