[ejabberd/f13/master] (13 commits) ...Merge branch 'master' into f13/master

[Peter Lemenkov]

Summary of changes:

  57a13ca... Ver. 2.1.3 (*)
  58b47dd... Init-script enhancements (*)
  29cb6d6... Fixed rhbz #564686 and some security-related issues (NOT cr (*)
  18843b3... Fix for rhbz #564686 (*)
  4e86b5d... Fixed typo in the init-script (*)
  f7e23e8... Fix permissions for captcha module (*)
  b15fc89... Ver. 2.1.4 (*)
  d463ca7... No hevea for s390 s390x and no hevea for EL-6 (*)
  dce8a08... Fix for Erlang/OTP R14A (*)
  c81e496... dist-git conversion (*)
  bff20b2... Ver. 2.1.5 (bugfix release) (*)
  695666a... Fixed http-poll (*)
  20c86b3... Merge branch 'master' into f13/master

(*) This commit already existed in another branch; no separate mail sent