Merge branch 'patch-2' into 'stable-3.1'

Till Brehm

2016-06-28 d44c3fa38bb0e29718ad7d4009342faf9d2a32a7

1
2
3
4
5
6
7
8
<div class='alert alert-danger clear'>
  <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
  <div class='alert-content'>
    <ol>
        <li>###ERRORMSG###</li>
    </ol>
  </div>
</div>