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

[Jan Staněk]

commit 2fd05179193da9212ad2a036a6fd07beb866c187
Merge: c3b3b35 67e2333
Author: Jan Staněk <jstanek at redhat.com>
Date:   Fri Mar 28 09:00:25 2014 +0100

    Merge branch 'master' into f20

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