[python-flask/el6] (6 commits) ...Merge branch 'master' into el6

[Ricky Elrod]

Summary of changes:

  8a4852f... Attempt a unified spec for both el6 and Fedora (*)
  91c645b... Update epoch and changelog, add a few things to .gitignore. (*)
  4a252f6... Fix changelog after I messed up merging... (*)
  bcd0cf4... Let's try this again - fix changelog messup. (*)
  7e1f9c8... Add epoch to the subpackage Requires. (*)
  88952e6... Merge branch 'master' into el6

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