Merge branch 'pajot-master'
authorJustin Lecher <jlec@gentoo.org>
Thu, 26 Nov 2015 11:43:40 +0000 (12:43 +0100)
committerJustin Lecher <jlec@gentoo.org>
Thu, 26 Nov 2015 11:43:40 +0000 (12:43 +0100)
* pajot-master:
  app-office/texmaker: make qt5 default
  app-office/texmaker: version bump to 4.5 #566790

Closes: Github gentoo/gentoo#404


Trivial merge