[wxsqlite3/f20: 3/3] Merge branch 'master' into f20

[Martin Gansser]

commit 6804f25f76779284b5bdae95c86cda1a295b0f89
Merge: 452e109 4dfd7c3
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jan 4 22:57:15 2015 +0100

    Merge branch 'master' into f20

 sources        |    2 +-
 wxsqlite3.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---