Merge branch 'master' of https://github.com/yurchor/util-linux

author Karel Zak <kzak@redhat.com>

Tue, 22 Jul 2014 10:01:50 +0000 (12:01 +0200)

committer Karel Zak <kzak@redhat.com>

Tue, 22 Jul 2014 10:01:50 +0000 (12:01 +0200)
author Karel Zak <kzak@redhat.com>
Tue, 22 Jul 2014 10:01:50 +0000 (12:01 +0200)
committer Karel Zak <kzak@redhat.com>
Tue, 22 Jul 2014 10:01:50 +0000 (12:01 +0200)
diff --cc login-utils/lslogins.c
Simple merge
diff --cc misc-utils/lsblk.c
Simple merge
author	Karel Zak <kzak@redhat.com>
	Tue, 22 Jul 2014 10:01:50 +0000 (12:01 +0200)
committer	Karel Zak <kzak@redhat.com>
	Tue, 22 Jul 2014 10:01:50 +0000 (12:01 +0200)
		1	2
login-utils/lslogins.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc-utils/lsblk.c	patch \|	diff1 \|	diff2 \|	blob \| history