]> err.no Git - systemd/commitdiff
Merge branch 'master' of ssh://git.freedesktop.org/git/systemd/systemd
authorKay Sievers <kay.sievers@vrfy.org>
Wed, 4 Apr 2012 03:23:51 +0000 (05:23 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Wed, 4 Apr 2012 03:23:51 +0000 (05:23 +0200)
1  2 
Makefile.am

diff --cc Makefile.am
Simple merge