opf/openproject — pull request #1479 by cratz (2014-06-17 12:03:26+00:00)
Title: fixes wiki font-size after bad resolved conflicts

in ed93fb982d19efef28d