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

[Jozef Mlich]

commit b4a42e7db2e136b0c0922217802c10e76ece03eb
Merge: b716e9c 64b49cf
Author: Jozef Mlich <jmlich at redhat.com>
Date:   Thu Oct 17 11:03:42 2013 +0200

    Merge branch 'master' into f20
    
    the prevversion (see package upgrade process) is updated
    from 9.2.4 to 9.2.5

 .gitignore                              |    3 +-
 postgresql-aarch64-atomic-upgrade.patch |   42 -------------------------------
 postgresql.spec                         |   10 ++++---
 sources                                 |    4 +-
 4 files changed, 10 insertions(+), 49 deletions(-)
---