Merge branch 'master' of https://code.google.com/p/d-bus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Oct 2014 03:04:41 +0000 (20:04 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Oct 2014 03:04:41 +0000 (20:04 -0700)

Trivial merge