commit 23b197969a6c1ddd9ac45d687af1a1b55b8d3e01 Merge: edf4762 7ba6b84 Author: Lasse Karstensen <lkarsten at varnish-software.com> Date: Fri Sep 4 15:41:09 2015 +0200 Merge branch 'master' into 4.1 Conflicts: redhat/varnish.spec