From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 14 Aug 2012 06:47:24 +0000 (+0400)
Subject: Merge branch 'nested-cats'
X-Git-Tag: 1.6.0~170
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=675b51e8ff6bf0e9a34dd4c774e2d619e27df505;p=tt-rss.git

Merge branch 'nested-cats'
---

675b51e8ff6bf0e9a34dd4c774e2d619e27df505