Fixes #5486: Use rotate instead of reload to trigger a rsyslog rotation in Rudder logrotate
Merge pull request #482 from Kegeruneku/bug_5486/int/5486_use_the_rotate_argument_in_wheezy_logrotate

Fixes #5486: Use rotate instead of reload to trigger a rsyslog rotation ...
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Refs #5505: Rewrite techniques to use normal ordering 2.6, new versions
Refs #5507: Rewrite techniques to use normal ordering on 2.10, new versions
Fixes #5505: Rewrite techniques to use normal ordering on 2.6
Refs #5446: Rewrite techniques to use only ${}
Fixes #5507: Rewrite techniques to use normal ordering on 2.10
Refs #5446: Rewrite techniques to use only ${}
Merge pull request #487 from peckpeck/bug_5505/rewrite_techniques_to_use_normal_ordering_on_2_6

Fixes #5505: Rewrite techniques to use normal ordering 2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge pull request #488 from peckpeck/bug_5507/rewrite_techniques_to_use_normal_ordering_on_2_10

Fixes #5507: Rewrite techniques to use normal ordering on 2.10
Fixes #5344: make timestamped backup of ssh config file
Merge pull request #469 from ncharles/bug_5344/dev/make_timestamp_backup_of_ssh_conf

Bug 5344/dev/make timestamp backup of ssh conf
Fixes #5519: Call list-comptible-inputs with /bin/sh
Fixes #5459: copy tools only if they are updated
Fixes #5301: add possibility to edit only a zone in a file
Merge pull request #447 from ncharles/bug_5301/int/edit_zone

Bug 5301/int/edit zone
Merge pull request #494 from peckpeck/bug_5519/call_list_comptible_inputs_with_bin_sh

Fixes #5519: Call list-comptible-inputs with /bin/sh
Fixes #5441: don't use cron on windows