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'
rtorrent: compile with xmlrpc-c for 3rd party UIs
Remove unnecessary dependencies and centralize version string.
haskell-cabal-bounds: update to 0.8.1
haskell-constraints: update to 0.4
haskell-conduit-extra: update to 1.1.3.1
haskell-bytes: update to 0.14.1
haskell-json-assertions: regenerate with cabal2nix
haskell-Strafunski-StategyLib: update to 5.0.0.4
haskell-distributed-process: update to 0.5.1
Merge pull request #3601 from Fuuzetsu/updates

Few Haskell updates