From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 13 Dec 2011 08:03:50 +0000 (+0400)
Subject: Merge branch 'master' into tiny-oop
X-Git-Tag: 1.5.8~21^2~10
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=94976024848e94f2e1987b82b0b1d0d4140a416d;p=tt-rss.git

Merge branch 'master' into tiny-oop
---

94976024848e94f2e1987b82b0b1d0d4140a416d