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
Added jmacro-*
polipo: update to 1.1.1
Package for Open Sans fonts.
Add haskell-simple-conduit
blaze-from-html: add version 0.3.2.1
Update haskell-simple-conduit
Fix various Haskell packages for 7.8
haskell-git-annex: corrections for darwin
haskell-djinn: corrections for darwin
update haskell-taggy-lens to version 0.1.2