Merge remote-tracking branch 'ccutrer/dev/max_db_connections'

author Marko Kreen <markokr@gmail.com>

Sat, 16 Nov 2013 18:18:09 +0000 (20:18 +0200)

committer Marko Kreen <markokr@gmail.com>

Sat, 16 Nov 2013 18:18:09 +0000 (20:18 +0200)
author Marko Kreen <markokr@gmail.com>
Sat, 16 Nov 2013 18:18:09 +0000 (20:18 +0200)
committer Marko Kreen <markokr@gmail.com>
Sat, 16 Nov 2013 18:18:09 +0000 (20:18 +0200)
diff --cc doc/config.txt
Simple merge
diff --cc src/loader.c
Simple merge
diff --cc src/objects.c
Simple merge
author	Marko Kreen <markokr@gmail.com>
	Sat, 16 Nov 2013 18:18:09 +0000 (20:18 +0200)
committer	Marko Kreen <markokr@gmail.com>
	Sat, 16 Nov 2013 18:18:09 +0000 (20:18 +0200)
		1	2
doc/config.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/loader.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/objects.c	patch \|	diff1 \|	diff2 \|	blob \| history