From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 20:20:21 +0000 (+0400)
Subject: Merge branch 'master' into pdo
X-Git-Tag: 1.7.9~25^2~155
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b6a74295915fb354543eadf6c1b658e15faefef7;p=tt-rss.git

Merge branch 'master' into pdo
---

b6a74295915fb354543eadf6c1b658e15faefef7