Merge branch 'master' into php5

* master:
  Fix indentation of _append_log in SSH1 and SSH2.
This commit is contained in:
Andreas Fischer 2013-12-26 12:00:42 +01:00
commit 83fbeac766
2 changed files with 113 additions and 113 deletions