Updated build.sh to hard reset the branch from the remote before building.
Merge branch 'v5-stable' into v7-stable
Merge branch 'v7-stable' of https://github.com/rsyslog/rsyslog-doc into v7-stable
Merge branch 'v7-stable' into v7-devel
Corrected merge conflict with version in conf.py.
Merge branch 'master' of https://github.com/rsyslog/rsyslog-doc