Merge remote-tracking branch 'upstream/master' into staging

2015-05-01 15:57:09 -07:00
parent 8591db4b10 cf0b6b7be8
commit 00df204c82
122 changed files with 2018 additions and 323 deletions
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
  '';

  meta = {
-    description = "A command line utility, written in C++, that converts HTML documents into plain text";
+    description = "Convert HTML to plain text";
    homepage = http://www.mbayer.de/html2text/;
    license = stdenv.lib.licenses.gpl2Plus;
    platforms = stdenv.lib.platforms.linux;