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

[Jan Staněk]

commit f575397bc80be8e23886aa6c2d90a5b4950d8bc3
Merge: 6ed6401 4bb8b3e
Author: Jan Staněk <jstanek at redhat.com>
Date:   Tue Nov 25 09:55:14 2014 +0100

    Merge branch 'master' into f20

 .gitignore  |    2 ++
 sources     |    4 ++--
 sqlite.spec |    9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)
---