Don't enable Flash by default in the Firefox wrapper
Fix alsa-utils
OpenAFS client fixes

Make it stoppable.  Add support for crypt and dynroot-sparse.
mysql module: Specify --basedir

Needed for mariadb and safe for mysql
firewall: Allow setting rate limits for pings
Add myself as maintainer of pkgs I wish to keep up-to-date
openscad: bump 2013.06 -> 2014.03

openscad now depends on glib, and it needs pkgconfig to find glib.
Added sharedLibs option to ITK
Merge branch 'pkgs/openvpn/openvpn_learnaddress' of git://github.com/offlinehacker/nixpkgs

add openvpn_learnaddress script
Merge branch 'vimPlugins.YouCompleteMe/update' of git://github.com/offlinehacker/nixpkgs

vimPlugins.YouCompleteMe: update to ee12530df0

Conflicts:
	pkgs/misc/vim-plugins/default.nix
Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs

Add nix-run and myEnvRun
Merge branch 'nixos/network-interfaces/ipv6' of git://github.com/offlinehacker/nixpkgs

nixos/network-interfaces: add support for static ipv6 addresses
haskell-wai-websockets: add version 2.1.0
haskell-leveldb-haskell: add version 0.3.0
haskell-snowball: add version 1.0.0.1
haskell-scrypt: add version 0.5.0
Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs

systemd: python support & journal http gateway

Conflicts:
	nixos/modules/misc/ids.nix
Merge branch 'u/zfs-import' of git://github.com/wizeman/nixpkgs

zfs: Misc fixes
Merge branch 'darcsum' of git://github.com/falsifian/nixpkgs

Added darcsum, "a pcl-cvs like interface for managing darcs patches".
Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs

Configure postgresql-9.3 with support for the ossp-uuid module

Conflicts:
	pkgs/servers/sql/postgresql/9.3.x.nix