Merge pull request #1595 from poettering/proxy-fixes
authorDavid Herrmann <dh.herrmann@googlemail.com>
Sun, 18 Oct 2015 10:15:10 +0000 (12:15 +0200)
committerDavid Herrmann <dh.herrmann@googlemail.com>
Sun, 18 Oct 2015 10:15:10 +0000 (12:15 +0200)
bus proxy fixes, and more

1  2 
src/basic/missing.h

Simple merge