From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 27 Mar 2013 08:48:13 +0000 (+0400)
Subject: Merge branch 'master' of git://github.com/RaphaelRochet/Tiny-Tiny-RSS into RaphaelRoc... 
X-Git-Tag: 1.7.6~251
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6d473e9cd5119848b6267d671226bdba9ee69fe3;p=tt-rss.git

Merge branch 'master' of git://github.com/RaphaelRochet/Tiny-Tiny-RSS into RaphaelRochet-master

Conflicts:
	locale/fr_FR/LC_MESSAGES/messages.mo
	locale/fr_FR/LC_MESSAGES/messages.po
---

6d473e9cd5119848b6267d671226bdba9ee69fe3