Merge remote-tracking branch 'origin/master'

diff --combined src/statsd-tg.c
index 9ab324f,5dda266..1d7f6af
--- 1/src/statsd-tg.c
--- 2/src/statsd-tg.c
+++ b/src/statsd-tg.c
@@@ -74,7 -74,7 +74,7 @@@ static void exit_usage (int exit_status
    fprintf ((exit_status == EXIT_FAILURE) ? stderr : stdout,
        PACKAGE_NAME" -- statsd traffic generator\n"
        "\n"
-       "  Usage: statsd-ng [OPTION]\n"
+       "  Usage: statsd-tg [OPTION]\n"
        "\n"
        "  Valid options:\n"
        "    -c <number>    Number of counters to emulate. (Default: %i)\n"
@@@ -86,7 -86,6 +86,7 @@@
        "                   (Default: "DEF_NODE")\n"
        "    -D <port>      Destination port of the network packets.\n"
        "                   (Default: "DEF_SERVICE")\n"
 +      "    -T <threads>   Number of threads to use to generate load.\n"
        "    -h             Print usage information (this output).\n"
        "\n"
        "Copyright (C) 2013  Florian Forster\n"
@@@ -249,7 -248,7 +249,7 @@@ static int read_options (int argc, cha
    conf_threads_num = (int) sysconf (_SC_NPROCESSORS_ONLN);
  #endif
  
 -  while ((opt = getopt (argc, argv, "c:t:g:s:S:d:D:h")) != -1)
 +  while ((opt = getopt (argc, argv, "c:t:g:s:S:d:D:T:h")) != -1)
    {
      switch (opt)
      {