Merge branch '3.2-maint'

* 3.2-maint:
  code style: Mention usage of curly braces around if/for/while/do bodies
  Bail out on compiler option -fstack-usage
  Mention new repository location on github

diff --cc HACKING.txt
Simple merge

diff --cc NEWS.txt
Simple merge

diff --cc README.txt
Simple merge

diff --cc compopt.c
index e225ebc948bf24af13d40938158ec6daea71b607,1b8dc7055467af0be27ded2b5a34e269abc19d9c..aef370de06f2b2cd4d7262dd5e42344ad567c244
--- 1/compopt.c
--- 2/compopt.c
+++ b/compopt.c
@@@ -60,21 -60,21 +60,22 @@@ static const struct compopt compopts[] 
        {"-fno-working-directory", AFFECTS_CPP},
        {"-fplugin=libcc1plugin", TOO_HARD}, /* interaction with GDB */
        {"-frepo",          TOO_HARD},
+       {"-fstack-usage",   TOO_HARD},
        {"-fworking-directory", AFFECTS_CPP},
 -      {"-idirafter",      AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 +      {"-idirafter",      AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
        {"-iframework",     AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 -      {"-imacros",        AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-imultilib",      AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-include",        AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-include-pch",    AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 +      {"-imacros",        AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-imultilib",      AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-include",        AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-include-pch",    AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
        {"-install_name",   TAKES_ARG}, /* Darwin linker option */
 -      {"-iprefix",        AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-iquote",         AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-isysroot",       AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-isystem",        AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-iwithprefix",    AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 -      {"-iwithprefixbefore", AFFECTS_CPP | TAKES_ARG | TAKES_PATH},
 +      {"-iprefix",        AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-iquote",         AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-isysroot",       AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-isystem",        AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-iwithprefix",    AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
 +      {"-iwithprefixbefore",
 +       AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
        {"-nostdinc",       AFFECTS_CPP},
        {"-nostdinc++",     AFFECTS_CPP},
        {"-remap",          AFFECTS_CPP},