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

2015-04-29 11:33:28 -05:00
parent 85aafda509 182acabbae
commit 1fe28a1132
134 changed files with 2172 additions and 576 deletions
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    homepage = http://pgpool.net/mediawiki/index.php;
-    description = "a middleware that works between postgresql servers and postgresql clients.";
+    description = "A middleware that works between postgresql servers and postgresql clients";
    license = licenses.free;
    platforms = platforms.linux;
    maintainers = with maintainers; [ wkennington ];