Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...)
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
Enable expressions for 'important' parts of the rest framework from Silk.co
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'