]> vaikene.ee Git - evaf/commitdiff
Merge branch 'master' into qt5
authorEnar Vaikene <enar.vaikene@cgi.com>
Fri, 9 Jan 2015 06:34:03 +0000 (08:34 +0200)
committerEnar Vaikene <enar.vaikene@cgi.com>
Fri, 9 Jan 2015 06:34:03 +0000 (08:34 +0200)

Trivial merge