* Some incorrect FB2 files support (li/i/b tags, href attributes with no namespace and with unknown namespace ids)
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics