bug #15 Bugfix merge commits have invalid html characters (peterrehm)
bug #15 Bugfix merge commits have invalid html characters (peterrehm)

Discussion
----------

<img width="791" alt="bildschirmfoto 2017-01-30 um 12 32 33" src="https://cloud.githubusercontent.com/assets/2010989/22421582/313fc2b0-e6e8-11e6-96c6-a1badcac485f.png">

Tickets:
- none

Commits
-------

- 4282c72 Bugfix merge commits have invalid html characters (peterrehm)

peterrehm/gh,sgnann/gh,sgnann/gh,peterrehm/gh