MAJ incomplète 13.04
Merge branch 'master' of github.com:rhannequin/upgrade-ubuntu

Conflicts:
	README.md