add bash-4.2 patches 25 through 39
Merge remote-tracking branch 'upstream/master' into bash.121120
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Applied to wrong branch.
Revert "add bash-4.2 patches 25 through 39"

This reverts commit b6c5b9806f6ae79652336a7cfb51fe0f03d0590a.
add missing patch for redis on OSX
Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2
Turn on Python plugin for vim_configurable by default

Python plugin for vim is turned on by default in ubuntu and other flavors of linux and mimicking
this in NixOS will help contribut to the impression that NixOS "just works."
Ion3 update to 20090110
Merge https://github.com/jcumming/nixpkgs into master_clean
haskell-bmp: update 1.2.3.x branch to 1.2.3.4
haskell-hashable: add version 1.2.0.2
haskell-heist: jailbreak to support latest version of 'hashable'
haskell-snap: jailbreak to support latest version of 'hashable'
haskell-Boolean: update to version 0.1.2
haskell-configurator: update to version 0.2.0.2
haskell-cryptohash: update to version 0.8.2
haskell-diagrams-contrib: update to version 0.6.0.1
haskell-hsemail: update to version 1.7.3
haskell-hslogger-template: update to version 2.0.2