plowshare: version bump
adom: add famous rogue-like game
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'
Remove unnecessary dependencies and centralize version string.
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.
Added haskell hex protobuf packages
add HaskellNet-SSL
Merge pull request #3611 from ederoyd46/haskell-protobuf

Added haskell hex and protobuf packages
Merge pull request #3598 from vesten/update-bar-aint-recursive

bar - Remove unnecessary dependencies and centralize version string.
Merge pull request #3613 from phunehehe/HaskellNet-SSL

add HaskellNet-SSL
haskell-HaskellNet-SSL: re-generate with cabal2nix
RcmdrPlugin_ROC: remove broken package

This build goes into an endless loop and produces gigabytes of useless
output. :-(