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

[Martin Gansser]

commit 683ec44fde18d2f0a9d8008ea6080a14e9f94053
Merge: 8aef99c 4dfd7c3
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jan 4 22:40:40 2015 +0100

    Merge branch 'master' into f21

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