From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 9 Mar 2014 17:48:55 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.12~22
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=baa65eedfd1a3b9e306e46de4cb0623fed558174;hp=-c;p=tt-rss.git

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
---

baa65eedfd1a3b9e306e46de4cb0623fed558174