Merge branch 'master' into full-month-stats

author Maxim Mamontov <faust.madf@gmail.com>

Sat, 24 Dec 2011 14:12:14 +0000 (16:12 +0200)

committer Maxim Mamontov <faust.madf@gmail.com>

Sat, 24 Dec 2011 14:12:14 +0000 (16:12 +0200)
author Maxim Mamontov <faust.madf@gmail.com>
Sat, 24 Dec 2011 14:12:14 +0000 (16:12 +0200)
committer Maxim Mamontov <faust.madf@gmail.com>
Sat, 24 Dec 2011 14:12:14 +0000 (16:12 +0200)
diff --cc projects/stargazer/plugins/store/postgresql/postgresql_store.h
Simple merge
author	Maxim Mamontov <faust.madf@gmail.com>
	Sat, 24 Dec 2011 14:12:14 +0000 (16:12 +0200)
committer	Maxim Mamontov <faust.madf@gmail.com>
	Sat, 24 Dec 2011 14:12:14 +0000 (16:12 +0200)