From: Roman Bazalevsky <rvb@rvb.name>
Date: Tue, 19 May 2015 14:04:08 +0000 (+0300)
Subject: Merge commit '2545d27aacfe57c8f26fccfd45e382fbf5c111ac'
X-Git-Url: https://git.rvb.name/weathermon.git/commitdiff_plain/769d0bd71b19b467c195838379a379e0e2d69c2b?ds=inline;hp=769d0bd71b19b467c195838379a379e0e2d69c2b

Merge commit '2545d27aacfe57c8f26fccfd45e382fbf5c111ac'

Conflicts:
	web/config_local.php
---