Merge remote-tracking branch 'github/pr/1883'

diff --combined README
index 2d552e436da19aa7e360f90e5cf858822aa36dd0,8eb3467de847f041a32283419e15ce5d93f1126d..ee909d640c328868f37a9ea04d9414443343ecc8
--- 1/README
--- 2/README
+++ b/README
@@@ -168,12 -168,6 +168,12 @@@ Feature
        Detailed CPU statistics of the “Logical Partitions” virtualization
        technique built into IBM's POWER processors.
  
 +    - lua
 +      The Lua plugin implements a Lua interpreter into collectd. This
 +      makes it possible to write plugins in Lua which are executed by
 +      collectd without the need to start a heavy interpreter every interval.
 +      See collectd-lua(5) for details.
 +
      - lvm
        Size of “Logical Volumes” (LV) and “Volume Groups” (VG) of Linux'
        “Logical Volume Manager” (LVM).
@@@ -428,10 -422,6 +428,10 @@@
        diskspace but is extremely portable and can be analysed with almost
        every program that can analyse anything. Even Microsoft's Excel..
  
 +    - lua
 +      It's possible to implement write plugins in Lua using the Lua
 +      plugin. See collectd-lua(5) for details.
 +
      - network
        Send the data to a remote host to save the data somehow. This is useful
        for large setups where the data should be saved by a dedicated machine.
@@@ -739,10 -729,6 +739,10 @@@ Prerequisite
      Used by the `openldap' plugin.
      <http://www.openldap.org/>
  
 +  * liblua (optional)
 +    Used by the `lua' plugin. Currently, Lua 5.1 and later are supported.
 +    <https://www.lua.org/>
 +
    * liblvm2 (optional)
      Used by the `lvm' plugin.
      <ftp://sources.redhat.com/pub/lvm2/>
@@@ -817,7 -803,7 +817,7 @@@
      <http://code.google.com/p/protobuf-c/>
  
    * libpython (optional)
 -    Used by the `python' plugin. Currently, Python 2.3 and later and Python 3
 +    Used by the `python' plugin. Currently, Python 2.6 and later and Python 3
      are supported.
      <http://www.python.org/>
  
@@@ -1031,6 -1017,5 +1031,5 @@@ Autho
    Sebastian tokkee Harl <sh at tokkee.org>,
    and many contributors (see `AUTHORS').
  
-   Please send bug reports and patches to the mailing list, see `Contact'
-   above.
- 
+   Please use GitHub reporting bugs and submitting pull requests.
+   See CONTRIBUTING.md for details.