* Sync with the trunk.
* Sync with the trunk.

garbas/nix,nbp/nix,acowley/nix,edolstra/nix,peti/nix,jcumming/nix,dtzWill/nix,joelmo/nix,puffnfresh/nix,zimbatm/nix,gridaphobe/nix,NixOS/nix,rowhit/nix,ysangkok/nix,bjornfor/nix,ysangkok/nix,gebner/nix,pikajude/nix,vcunat/nix,peti/nix,edolstra/nix,wmertens/nix,peti/nix,NixOS/nix,rowhit/nix,rycee/nix,pikajude/nix,zimbatm/nix,jcumming/nix,bennofs/nix,shlevy/nix,bennofs/nix,gridaphobe/nix,edolstra/nix,shlevy/nix,ysangkok/nix,rycee/nix,offlinehacker/nix,bjornfor/nix,bennofs/nix,dtzWill/nix,tchajed/nix,garbas/nix,ehmry/nix,ttuegel/nix,gebner/nix,ehmry/nix,offlinehacker/nix,joelmo/nix,layus/nix,wmertens/nix,ehmry/nix,vcunat/nix,edolstra/nix,acowley/nix,dezgeg/nix,vizanto/nix,joelmo/nix,nbp/nix,jcumming/nix,aucampia/nix,rycee/nix,aucampia/nix,nbp/nix,garbas/nix,pikajude/nix,tchajed/nix,ttuegel/nix,puffnfresh/nix,gridaphobe/nix,ttuegel/nix,bjornfor/nix,acowley/nix,dtzWill/nix,rycee/nix,ehmry/nix,gridaphobe/nix,dtzWill/nix,tchajed/nix,peti/nix,vizanto/nix,bennofs/nix,zimbatm/nix,layus/nix,aucampia/nix,layus/nix,vcunat/nix,dtzWill/nix,vcunat/nix,rowhit/nix,NixOS/nix,shlevy/nix,tchajed/nix,ehmry/nix,layus/nix,puffnfresh/nix,joelmo/nix,vizanto/nix,vizanto/nix,dezgeg/nix,shlevy/nix,wmertens/nix,peti/nix,shlevy/nix,nbp/nix,layus/nix,dezgeg/nix,puffnfresh/nix,dezgeg/nix,rycee/nix,ttuegel/nix,offlinehacker/nix,aucampia/nix,zimbatm/nix,bjornfor/nix,acowley/nix,gebner/nix,jcumming/nix,NixOS/nix,edolstra/nix,garbas/nix,offlinehacker/nix,gebner/nix,ehmry/nix,dezgeg/nix,rowhit/nix,garbas/nix,wmertens/nix,NixOS/nix