]> git.wh0rd.org - tt-rss.git/commit
Merge branch 'master' of git://github.com/skikuta/Tiny-Tiny-RSS into skikuta-master
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 25 Mar 2013 08:23:20 +0000 (12:23 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 25 Mar 2013 08:23:20 +0000 (12:23 +0400)
commit28425ec7028321bef5de72956c82bcd66d2b16ad
tree38f9e30700ab8dc38c483931085104d46d2e7f29
parent0b0822c2f11b75515a113b7c88c18f384a9dced0
parent798e241e54c11770142cfcc0bba2a9ceb39f8801
Merge branch 'master' of git://github.com/skikuta/Tiny-Tiny-RSS into skikuta-master

Conflicts:
locale/ja_JP/LC_MESSAGES/messages.po