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.
Package for Open Sans fonts.
Consistently use the package name opensans-ttf everywhere.
Enable expressions for 'important' parts of the rest framework from Silk.co
Add virtualenvwrapper and its dependencies
Add prelink package
fix icu4c build on darwin
Merge branch 'master' of github.com:aycanirican/nixpkgs
Merge remote-tracking branch 'upstream/master'
Merge branch 'haskellPackages.rest'
resolved conflicts
Merge branch 'fluffynukeit-add-rest-framework'