Updated build.sh to properly reset the current branch while building documentation.
fix version info in v7-stable
Merge pull request #18 from UGerhards/v7-stable-release

fix version info in v7-stable
fix LICENSE file

we are not yet under ASL 2.0!
Merge pull request #21 from rgerhards/v5-stable-license

fix LICENSE file
Removed duplicate entry from tutorials.
Merge branch 'v5-stable' into v7-stable
document new action suspesion/resumption reporting parameters
some minor fixes to action documentation (mostly formatting)
small fixes to action documentation
fix indention
Merge pull request #23 from rgerhards/v7-stable-newactionsuspparams

document new action suspesion/resumption reporting parameters
Merge pull request #25 from rgerhards/v5-stable-nitfixes

V5 stable nitfixes
Merge branch 'v5-stable' into v7-stable
Merge branch 'v7-stable' of github.com:rsyslog/rsyslog-doc into v7-stable

Conflicts:
	source/configuration/actions.rst
	source/configuration/basic_structure.rst
Updated modules to new template in development.
Merge branch 'v5-stable' into v7-stable

Conflicts:
	source/configuration/modules/imfile.rst
Applied new module formatting template that is in developement
Merge branch 'v5-stable' into v7-stable

Manually Resolved Conflicts:
	source/configuration/modules/impstats.rst
	source/configuration/modules/imptcp.rst
Updated to new module template format.