Merge remote-tracking branch 'origin/master' master
authorMichael Adam <obnox@samba.org>
Mon, 7 Dec 2015 14:00:37 +0000 (15:00 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 7 Dec 2015 14:00:37 +0000 (15:00 +0100)
commitdf5f7ba2f6c4768b18d07be5af8c92bf6e756191
tree06cb3eb97d07eeddc90c1c740fb15edded3dd521
parent5cd378a99e2858fb30e88e93db0f2889709f6a70
parenta8bac11f2e3c2596bfa8d3e4e4b3315534b89884
Merge remote-tracking branch 'origin/master'