all: merge branch 'pre-gdbus-bgo622927'
authorDan Winship <danw@redhat.com>
Fri, 24 Jul 2015 17:25:55 +0000 (13:25 -0400)
committerDan Winship <danw@redhat.com>
Fri, 24 Jul 2015 17:25:55 +0000 (13:25 -0400)
Misc pre-gdbus-port stuff

https://bugzilla.gnome.org/show_bug.cgi?id=622927


Trivial merge