added alock package
rustc: fixed build after 7068828389390dca066fb1062bd27148d49339d4

That commit changed the patch to work for the new HEAD, but that new
patch breaks 0.11. I made two patch for the two versions.
Added httptunnel package.
opencv: update 2.4.7 -> 2.4.9
Merge pull request #4115 from madjar/master

rustc: fixed build after 7068828389390dca066fb1062bd27148d49339d4
python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix
python34Packages.sympy: disable due to test failures
dvdisaster: new package

dvdisaster: new package
add mathematica 10 (slightly borked but runs)
Merge pull request #4102 from ftrvxmtrx/alock

added alock package
strongswan: build with clang

Fixes https://lists.strongswan.org/pipermail/users/2014-September/006597.html
clamav: add myself to lib.maintainers
clamav: add myself as a maintainer
keepnote: add myself as a maintainer
gtest: Update meta
protobuf: 2.5.0 -> 2.6.0
protobuf-c: 0.15 -> 1.0.2
Merge pull request #4136 from robberer/pkgs/clamav

clamav: add myself as a maintainer
Merge pull request #4137 from robberer/bump/keepnote

keepnote: add myself as a maintainer
Merge pull request #4130 from k0ral/httptunnel

Added httptunnel package.