[javasqlite/el6: 5/5] Merge branch 'master' into el6

[Ville Skyttä]

commit 01803295b81b7e48273771489080f8533e751f86
Merge: 51d8128 c220163
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Nov 26 19:04:25 2013 +0200

    Merge branch 'master' into el6

 javasqlite.spec |   28 +++++++++++++++++-----------
 sources         |    2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)
---