]> git.wh0rd.org - tt-rss.git/commit
fix merge conflict with master
authorAndrew Dolgov <fox@bah.org.ru>
Mon, 13 Sep 2010 10:50:23 +0000 (14:50 +0400)
committerAndrew Dolgov <fox@bah.org.ru>
Mon, 13 Sep 2010 10:50:23 +0000 (14:50 +0400)
commit4973c5ef559316dda90108f5854701389790e407
tree462d9512f0495689ac3b6f95d933ddf490e1ed87
parentc7a5c8a5a2703f78bf36dc3f2c5cc2f8fc8ec713
parent0dfdf70816eb7ec94ac8d009829cf6ad4c4d162f
fix merge conflict with master