Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
haskell-stm-containers: add package version 0.1.2 and its dependencies
Bump Logstash to 1.4.2
gbdfed: add package 1.6
Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...)
Install all dirs for logstash

Also only patch shebangs in bin/ directory
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
vagrant: upgrade to 1.6.3
polipo: update to 1.1.1
Package for Open Sans fonts.
haskell-cabal2nix: update to version 1.66
Re-generate Haskell expressions with cabal2nix.
Re-generate Haskell expressions with cabal2nix.
polipo: new service expression
oraclejdk: Update to 7u65
Merge pull request #3285 from ehmry/polipo

Polipo
oraclejdk: Include "oracle" in name
oraclejdk: Make version consistent with openjdk