add vobsub2srt-git-20131228-1c782e5
Merge branch 'vobsub2srt' of github.com:ttuegel/nixpkgs into vobsub2srt
add mathematica-9.0.1
Don't set a default version of Mathematica

Nixpkgs should not set a default version of Mathematica. Many users of
Mathematica have institutional licenses and do not have immediate access
to new versions. If there is a default version in Nixpkgs, updating that
version will cause trouble for all such users.
Update hipchat
linux: Update to 3.4.78
amdadl-sdk: set license to unfree (close #1647)

We cannot auto build amdadl-sdk on hydra, so setting license to unfree disable
auto builds. I also remove amdadl license, because it's irrelevant.

vcunat changed string license to attribute.
fixup previous commit: do the change to attribute
httpd: Only add PHPRC to environment of httpd when enablePHP is true.
httpd: Respect original order of environment eval.
kernel: Upgrade from 3.13.0 -> 3.13.1
Merge pull request #1653 from wkennington/master.kernel

kernel: Upgrade from 3.13.0 -> 3.13.1
zsh: don't clobber the environment of non-login shells
Merge branch 'mathematica' into installed-next
Merge branch 'vobsub2srt' into installed-next
Merge branch 'zsh' into installed-next