[pam_url/el6] (5 commits) ...Fix bad merge

[Konstantin Ryabitsev]

Summary of changes:

  c606c7b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  7a9bfe8... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  fc02b35... Upstream 0.3.3 with minor new features (*)
  7a89227... Merge branch 'master' of ssh://pkgs.fedoraproject.org/pam_u (*)
  a65392f... Fix bad merge (*)

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