[python-django/f18] (3 commits) ...correct last merging error

[Matthias Runge]

Summary of changes:

  b2d54f4... Security update to 1.4.3 (*)
  18ff3a3... Merge branch 'master' of ssh://pkgs.fedoraproject.org/pytho (*)
  0a1abf0... correct last merging error (*)

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