Merge pull request #95 from fire/travis-pull-request
authorManuel Nickschas <sputnick@quassel-irc.org>
Mon, 22 Sep 2014 18:14:20 +0000 (20:14 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Mon, 22 Sep 2014 18:14:20 +0000 (20:14 +0200)
Tell travis to create a matrix of gcc 4.7, clang 3.4, qt4 and qt5.


Trivial merge