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

[Jan Staněk]

commit 6ed6401bbe44fa08d5495b9fb9db4a709bffdd35
Merge: 320c05d b275f4c
Author: Jan Staněk <jstanek at redhat.com>
Date:   Tue Oct 21 10:15:52 2014 +0200

    Merge branch 'master' into f20

 .gitignore                                  |    2 ++
 sources                                     |    4 ++--
 sqlite-3.7.10-pagecache-overflow-test.patch |   17 -----------------
 sqlite.spec                                 |   25 ++++++++++++-------------
 4 files changed, 16 insertions(+), 32 deletions(-)
---