]> git.proxmox.com Git - systemd.git/commitdiff
Merge tag 'upstream/225'
authorMartin Pitt <martin.pitt@ubuntu.com>
Fri, 28 Aug 2015 04:13:11 +0000 (06:13 +0200)
committerMartin Pitt <martin.pitt@ubuntu.com>
Fri, 28 Aug 2015 04:13:11 +0000 (06:13 +0200)
Upstream version 225


Trivial merge