Merge branch 'master' into 'master'

Marius Cramer

2015-01-10 0d5e54e5a149a24f8cc04989be2e7611d98852a4

 interface/web/sites/templates/web_directive_snippets.htm

@@ -10,5 +10,5 @@
         {tmpl_var name='name'}

      </option>

      </tmpl_loop>

   </select>

</div></div>
   </select></div>

</div>