[postgresql/f20: 11/11] Merge branch 'master' into f20

[Jozef Mlich]

commit 6ef2296cb7ec586c795dd78f0eeca19e6fa4b7a1
Merge: 5ff2bd1 a2f501b
Author: Jozef Mlich <jmlich at redhat.com>
Date:   Thu Feb 20 16:50:26 2014 +0100

    Merge branch 'master' into f20

 .gitignore       |    3 ++
 postgresql-setup |   73 +++++++++++++++++++++++++++++++++++++++++---------
 postgresql.spec  |   78 ++++++++++++++++++++++++++++++++++++++----------------
 sources          |    6 ++--
 4 files changed, 121 insertions(+), 39 deletions(-)
---