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

[Jozef Mlich]

commit 0f717d9dd5dc3ff0722fb1f03b952f5c29b9ef93
Merge: d0636d3 365123c
Author: Jozef Mlich <jmlich at redhat.com>
Date:   Thu Mar 20 17:29:10 2014 +0100

    Merge branch 'master' into f20

 .gitignore                                         |    3 +
 ...ql-wal-replay-of-locking-an-updated-tuple.patch |   46 --------------------
 postgresql.spec                                    |   12 +++--
 sources                                            |    6 +-
 4 files changed, 13 insertions(+), 54 deletions(-)
---