Merge pull request #1831 from keszybz/todo-trimming

author Tom Gundersen <teg@jklm.no>

Tue, 10 Nov 2015 13:43:42 +0000 (14:43 +0100)

committer Tom Gundersen <teg@jklm.no>

Tue, 10 Nov 2015 13:43:42 +0000 (14:43 +0100)
author Tom Gundersen <teg@jklm.no>
Tue, 10 Nov 2015 13:43:42 +0000 (14:43 +0100)
committer Tom Gundersen <teg@jklm.no>
Tue, 10 Nov 2015 13:43:42 +0000 (14:43 +0100)
diff --cc TODO
Simple merge
diff --cc man/machinectl.xml
Simple merge
author	Tom Gundersen <teg@jklm.no>
	Tue, 10 Nov 2015 13:43:42 +0000 (14:43 +0100)
committer	Tom Gundersen <teg@jklm.no>
	Tue, 10 Nov 2015 13:43:42 +0000 (14:43 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
man/machinectl.xml	patch \|	diff1 \|	diff2 \|	blob \| history