libretro-cores:
  - adding: 4do, desmume, fceumm, mame, mupen64plus, scummvm,
            snes9x, stella, picodrive, ppsspp and vba

retroarch:
  - added retroarch wrapper for configured cores
  - changed attributes, old retroarch is now retroarchBare*
Merge pull request #3800 from edwtjo/libretro-cores

retroarchWrapper: added wrapRetroArch, libretro-cores: adding some cores
vagrant: 1.6.3 -> 1.6.4
Add myself to lib/maintainers.nix
add postgresql 9.4beta2
fix license for postgresql packages
fix typo in postgresql license definition
Merge pull request #3969 from manveru/vagrant

vagrant: 1.6.3 -> 1.6.4
buildLocalCabal: Use host-native nixpkgs for the call to cabal2nix by default
Update BATMAN module
moc: update from 2.5.0-beta2 to 2.5.0
also set platforms to linux, use default configurePhase and adopt it
virtualbox: vboxusers may use /dev/vboxnetctl
Merge pull request #3970 from manveru/virtualbox-vboxnetctl

virtualbox: vboxusers may use /dev/vboxnetctl
thunderbird: maintenance update, including security