Merge branch 'master' into wip/mdraid
authorDavid Zeuthen <zeuthen@gmail.com>
Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)
committerDavid Zeuthen <zeuthen@gmail.com>
Wed, 3 Oct 2012 14:12:14 +0000 (10:12 -0400)
commit2174256413b05e1f423c046c596ef981b52e7d82
treeca658d827f8a861c3862212f5ec0314ec2ba253d
parentfd9277e38cd59bcfdc9b064b257e77a69f86511f
parent56b03b867e21610edcd4a9335e46f6897e1ccb3f
Merge branch 'master' into wip/mdraid
data/80-udisks2.rules
data/org.freedesktop.UDisks2.xml
doc/udisks2-sections.txt
src/udisksdaemonutil.c
udisks/udisksclient.c