From: skikuta <kik0220@gmail.com>
Date: Wed, 20 Mar 2013 23:39:52 +0000 (+0900)
Subject: Merge branch 'master' of github.com:skikuta/Tiny-Tiny-RSS
X-Git-Tag: 1.7.6~312^2~1
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4687055dfe9cdf93b9cd546f26b36e32b4ee0a63;p=tt-rss.git

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

Conflicts:
	locale/ja_JP/LC_MESSAGES/messages.po
---

4687055dfe9cdf93b9cd546f26b36e32b4ee0a63