Merge branch 'Paco' into staging

Conflicts:
	Documentation/contributor/doc-work.itexi
	Documentation/contributor/source-code.itexi

diff --cc Documentation/contributor/source-code.itexi
index 97e1025e47bf9f9809207b6d847ab20a84fbd7a8,032bb9b7d4b790833bfbda580966b7c0e0380572..e0ce2c26bfafd1aad00c51991c628a7a87bc31a3
--- 1/Documentation/contributor/source-code.itexi
--- 2/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@@ -1019,12 -1019,12 +1019,11 @@@ git merge @var{foo
  
  If any conflict happens, see @ref{Resolving conflicts}.
  
--There are common usage cases for merging: as a translator, you
- will often want to merge @code{master} into
 -will often want the Translations meister to merge @code{master} into
--@code{translation}; on the other hand, the Translations
--meister wants to merge @code{translation} into
- @code{master} whenever he has checked that
 -@code{staging} whenever he has checked that
--@code{translation} builds successfully.
++There are common usage cases for merging: as a translator, you will
++often want the Translations meister to merge @code{master} into
++@code{translation}; on the other hand, the Translations meister wants
++to merge @code{translation} into @code{staging} whenever he has
++checked that @code{translation} builds successfully.
  
  
  @node Commits and patches