]> git.proxmox.com Git - systemd.git/commit
Merge branch 'master' into experimental
authorSjoerd Simons <sjoerd@luon.net>
Fri, 8 Aug 2014 21:18:00 +0000 (23:18 +0200)
committerSjoerd Simons <sjoerd@luon.net>
Fri, 8 Aug 2014 21:29:59 +0000 (23:29 +0200)
commit0e55fda590cbd6c8f6020f6477d77661fdfb3979
treeaab21bd834d35f9a5fedba42bb9fdcb6e80d247b
parentc40546a9945d83ad4f1273446eb1572460c753b5
parent72405a1a3d77eeed845a8b9773dcf98a1c530836
Merge branch 'master' into experimental

Conflicts:
debian/changelog
debian/control
debian/patches/series
debian/rules
debian/changelog
debian/control
debian/patches/Add-support-for-TuxOnIce-hibernation.patch
debian/patches/Start-logind-on-demand-via-libpam-systemd.patch
debian/patches/series
debian/rules
debian/systemd.install