From: Maxim Mamontov <faust.madf@gmail.com>
Date: Mon, 6 Jan 2014 15:51:09 +0000 (+0200)
Subject: Merge branch 'new-daily-fee'
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/8569ecdc2c9368dc0fe650b901cce7b37337ffec?ds=sidebyside;hp=8569ecdc2c9368dc0fe650b901cce7b37337ffec

Merge branch 'new-daily-fee'

Conflicts:
	include/stg/tariff_conf.h
	projects/stargazer/plugins/store/firebird/Makefile
	projects/stargazer/plugins/store/firebird/firebird_store.cpp
	projects/stargazer/plugins/store/firebird/firebird_store.h
	projects/stargazer/plugins/store/mysql/Makefile
	projects/stargazer/plugins/store/mysql/mysql_store.cpp
	projects/stargazer/plugins/store/mysql/mysql_store.h
	projects/stargazer/plugins/store/postgresql/Makefile
	projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
	projects/stargazer/plugins/store/postgresql/postgresql_store.h
	projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
---