qgis/QGIS-Documentation — pull request #356 by diethard2 (2014-11-14 15:50:39+00:00)
Title: Explain the HTML frame composer Item of print composer

Gave myself a little git conflict which was solved.
The use of the HTML Frame composer item is explained for 2.6 which has improved a lot.