Use session.datasource config option to determine storage method
Merge branch 'master' of git@github.com:jbaicoianu/elation