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

Merge branch 'master' into pdo
---

c8784bceecfd4aef7240a3daf07401fb923db804