Added SciTE 3.3.7.
Add emacs minor mode writegood
Add haskell package 'taffybar'
Add Haskell package 'gtk-traymanager'
Weechat: Update to 0.4.3
haskellPackages.jsonAssertions: New expression
haskellPackages.diff3: New expression
nixos/memtest: Allow user to specify memtest86 boot parameters
nixos/memtest: use docbook formatting

Without this the HTML manual and manpage is quite unreadable (newlines
are squashed so it doesn't look like a list anymore).

(Unfortunately, this makes the source unreadable.)
Upgrade bumblebee and add nixos module

 * Bump bumblebee to 3.2.1
 * Remove config.patch - options it added can be passed to ./configure now
 * Remove the provided xorg.conf
   Provided xorg.conf was causing problems for some users,
   and Bumblebee provides its own default configuration anyway.
 * Make secondary X11 log to /var/log/X.bumblebee.log
 * Add a module for bumblebee
Bumping ATS/Postiats version to 0.0.5.
Merge branch 'master' of git://github.com/ashalkhakov/nixpkgs

Bumping ATS/Postiats version to 0.0.5. #1719
Force a rebuild
spring: use wrapper to set gcc lib path
spring: don't pass glibc
Merge pull request #1716 from ocharles/haskellPackages.diff3

haskellPackages.diff3: New expression
Merge pull request #1715 from ocharles/haskellPackages.jsonAssertions

haskellPackages.jsonAssertions: New expression
Merge pull request #1712 from PkmX/pr-taffybar

Add haskell packages 'gtk-traymanager' and 'taffybar'
springlobby: specify spring run-time dependency paths
springlobby: add unitsync patch