Merge branch 'gdr-manpages' into wip.rebase

diff --cc .gitignore
index e821bb4afae698838adf0f04a3a977422d0c1da7,a804fa3cac5236228d3b5d737c3b60c4af06935e..ba7af7890f82c3a3d80d504b71755d5bdc8e9d6c
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -12,7 -11,6 +12,8 @@@ dgit-nmu-simple.
  dgit-maint-native.7
  dgit-maint-merge.7
  dgit-maint-gbp.7
+ dgit-maint-debrebase.7
  dgit-sponsorship.7
 +git-debrebase.1
 +git-debrebase.5
  substituted

diff --cc Makefile
Simple merge