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

[Pavel Raiskup]

commit 5ff2bd16670b73661d0255cb7c7e3d73bd7a6abf
Merge: e08eead 4c6bd5d
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Mon Dec 16 14:47:45 2013 +0100

    Merge branch 'master' into f20

 postgresql-setup |  226 ++++++++++++++++++++++++++++-------------------------
 postgresql.spec  |    8 ++-
 2 files changed, 126 insertions(+), 108 deletions(-)
---