From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 11:36:14 +0000 (+0400)
Subject: Merge branch 'master' into css-feedtree-counter
X-Git-Tag: 1.7.9~25
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=82076ce53113be9cc053f8740356e7e1b81e5643;p=tt-rss.git

Merge branch 'master' into css-feedtree-counter

Conflicts:
	tt-rss.css
---

82076ce53113be9cc053f8740356e7e1b81e5643