Merge branch 'upstream' into pam_mount

Conflicts:
	pkgs/top-level/all-packages.nix
Fix description in pam_mount and libHX. Add tstrobel as maintainer.
pdf2svg: PDF converter utility to SVG format
New package: openbox-menu
openbox window manager: add tool to set desktop layout
Merge pull request #4093 from wavewave/pdf2svg

pdf2svg: PDF converter utility to SVG format
Update hipchat to 2.2.1163
New package: Solvespace.

A parametric 2D/3D CAD application.
davmail: updated to 4.5.1
kmod: bump
Added bashmount package.
Merge pull request #4098 from k0ral/bashmount

Added bashmount package.
firefox: Update to 32.0.1
Merge branch 'wyvie-master'
Merge pull request #3694 from matejc/cmst

new package: cmst - qt gui for connman
monero: intial expression for 0.8.8.3

http://monero.cc
Merge pull request #4043 from ehmry/monero

monero: intial expression for 0.8.8.3
Merge pull request #4073 from k0ral/psutil

Upgraded python-psutil to v2.1.1
Merge pull request #4097 from madjar/master

davmail: updated to 4.5.1
xf86_input_wacom: update from 0.25.99.1 to 0.26.0