ati-drivers: bump version to 14.4
ati_unfree: Create a nixos module for the ati_unfree x11 driver and
blacklist the radeon driver when ati_unfree is installed.
ati_unfree: Towards using ati unfree 32bit binary libs
ati_unfree: Update nixos-manual for AMD driver support
gnome-shell-pomodoro for gnome 3.12 package
ati_unfree: Patch ati binary libs to use /run/opengl-driver-*/lib/dri .
ati_unfree: Cleanup whitespace in builder.sh
Review PR in travis with nox-review
haskell-vty: update to 5.2.2
rubyLibs: add heroku client
Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs
manpages: update from 3.71 to 3.72
oniguruma: update from 5.9.4 to 5.9.5
Merge pull request #4195 from madjar/master

Review PR in travis with nox-review
Merge pull request #4169 from DamienCassou/gnome-shell-pomodoro

gnome-shell-pomodoro for gnome 3.12 package
meta for ocamlPackages.eliom
Merge pull request #4199 from FlorentBecker/master

meta for ocamlPackages.eliom
aria2: Bump version to 1.18.8
orc: disable tests
libretro: added bsnes, fba, gambatte, genesis-plus-gx, prboom