Merge branch 'master' into wip/mdraid

author David Zeuthen <zeuthen@gmail.com>

Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)

committer David Zeuthen <zeuthen@gmail.com>

Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)
author David Zeuthen <zeuthen@gmail.com>
Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)
committer David Zeuthen <zeuthen@gmail.com>
Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)
diff --cc data/80-udisks2.rules
Simple merge
diff --cc data/org.freedesktop.UDisks2.xml
Simple merge
diff --cc doc/udisks2-sections.txt
Simple merge
diff --cc src/udisksdaemonutil.c
Simple merge
diff --cc udisks/udisksclient.c
Simple merge
author	David Zeuthen <zeuthen@gmail.com>
	Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)
committer	David Zeuthen <zeuthen@gmail.com>
	Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)
		1	2
data/80-udisks2.rules	patch \|	diff1 \|	diff2 \|	blob \| history
data/org.freedesktop.UDisks2.xml	patch \|	diff1 \|	diff2 \|	blob \| history
doc/udisks2-sections.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/udisksdaemonutil.c	patch \|	diff1 \|	diff2 \|	blob \| history
udisks/udisksclient.c	patch \|	diff1 \|	diff2 \|	blob \| history