From: Enar Vaikene <enar.vaikene@cgi.com>
Date: Fri, 9 Jan 2015 06:34:03 +0000 (+0200)
Subject: Merge branch 'master' into qt5
X-Git-Url: https://vaikene.ee/gitweb/highlight.css?a=commitdiff_plain;h=36bd93cf4263b118366b3db2d26e8efb1ac1b690;hp=54ba529e92fc38a29f5b5dd29cffd1769811bebe;p=evaf

Merge branch 'master' into qt5
---