Merge branch 'maint'

diff --combined .gitignore
index f050f3a1f9f36d9e9cbd83115c8b890aefcbf4a2,0000ba4195ab09f3dc782eeb87b9eabf106d02d9..d3a1fc5e94aa4cba84113021557b0a1b882a4f93
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,4 @@@
 -*.[oa]
 +objects
  foo*
  bar*
  para_*
@@@ -18,6 -18,7 +18,7 @@@ Makefile.dep
  TODO
  NONE
  aclocal.m4
+ *_command_list.c
  *_command_list.h
  *_command_list.man
  paraslash-git.tar.bz2
@@@ -29,4 -30,4 +30,4 @@@ web_syn
  confdefs.h
  conftest
  conftest.c
 -
 +GIT-VERSION-FILE