* save
Merge branch 'onglets' of github.com:hurlebouc/GDuplicity into onglets

Conflicts:
	GDuplicity.xcodeproj/project.pbxproj