[python-django/f19] (3 commits) ...Merge branch 'master' into f19

[Matthias Runge]

Summary of changes:

  5446958... resolve conflicts (rhbz#998640) (*)
  bf9034d... update to 1.5.3, fix cve 2013-4315 (*)
  af9b086... Merge branch 'master' into f19

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