Merge pull request #486 from saa/sqlite_support

author Evgeny Khramtsov <xramtsov@gmail.com>

Wed, 8 Apr 2015 11:34:56 +0000 (14:34 +0300)

committer Evgeny Khramtsov <xramtsov@gmail.com>

Wed, 8 Apr 2015 11:34:56 +0000 (14:34 +0300)
author Evgeny Khramtsov <xramtsov@gmail.com>
Wed, 8 Apr 2015 11:34:56 +0000 (14:34 +0300)
committer Evgeny Khramtsov <xramtsov@gmail.com>
Wed, 8 Apr 2015 11:34:56 +0000 (14:34 +0300)
diff --cc .gitignore
Simple merge
diff --cc .travis.yml
Simple merge
diff --cc ejabberd.yml.example
Simple merge
diff --cc rebar.config.script
Simple merge
diff --cc src/ejabberd_odbc.erl
Simple merge
diff --cc src/odbc_queries.erl
Simple merge
author	Evgeny Khramtsov <xramtsov@gmail.com>
	Wed, 8 Apr 2015 11:34:56 +0000 (14:34 +0300)
committer	Evgeny Khramtsov <xramtsov@gmail.com>
	Wed, 8 Apr 2015 11:34:56 +0000 (14:34 +0300)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
ejabberd.yml.example	patch \|	diff1 \|	diff2 \|	blob \| history
rebar.config.script	patch \|	diff1 \|	diff2 \|	blob \| history
src/ejabberd_odbc.erl	patch \|	diff1 \|	diff2 \|	blob \| history
src/odbc_queries.erl	patch \|	diff1 \|	diff2 \|	blob \| history