Added gcolor2
Merge branch 'master' of https://github.com/NOTtheMessiah/nixpkgs
Update default.nix
added license for gcolor2 and myself to maintainers
Merge branch 'master' of https://github.com/NOTtheMessiah/nixpkgs
nodejs: Update to 0.10.30
teamspeak_client: 3.0.13.1 -> 3.0.16
Fix default icon location in 'wrapFirefox'
tigervnc: upgrade to 1.3.1 security release

The source is on github archive now. Therefore switch to fetchurl.
flexget: Updated to 1.2.161, with additional dependancies added.
Also made deluge plugin support conditional on deluge being installed,
and added similar conditional support for the transmission plugin.
Vim-plugins: add vim-pathogen
mailutils: fix for sendmail path
Merge remote-tracking branch 'upstream/master'
Added implicit and storableEndian to haskellPackages for ImplicitCAD
haskell-haskore: update to 0.2.0.4
Merge pull request #3626 from Fuuzetsu/haskore

haskell-haskore: update to 0.2.0.4
haskell-bits-extras: add version 0.1.3
haskell-base32-bytestring: add version 0.2.1.0
elasticsearch: fix darwin, needs getopt
Merge pull request #3627 from Fuuzetsu/base32-bytestring

Base32 bytestring