From: Maxim Mamontov <faust.madf@gmail.com>
Date: Fri, 26 Jul 2013 18:53:47 +0000 (+0300)
Subject: Merge branch 'master' into full-month-stats
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/9a834ba2e0caea6edffec5c1db403cf9832ea96e?hp=9a834ba2e0caea6edffec5c1db403cf9832ea96e

Merge branch 'master' into full-month-stats

Conflicts:
	projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp
---