From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 10:50:23 +0000 (+0400)
Subject: fix merge conflict with master
X-Git-Tag: 1.5.0~435^2~1^2~14
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4973c5ef559316dda90108f5854701389790e407;p=tt-rss.git

fix merge conflict with master
---

4973c5ef559316dda90108f5854701389790e407