Andrew Dolgov aadfbbc18b Merge branch 'master' of git://github.com/dalingrin/Tiny-Tiny-RSS-for-Honeycomb ... Conflicts: res/values/strings.xml res/xml/preferences.xml		2013-04-18 16:40:57 +04:00
..
fox/ttrss	Merge branch 'master' of git://github.com/dalingrin/Tiny-Tiny-RSS-for-Honeycomb	2013-04-18 16:40:57 +04:00