Merge commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:31:22 +0000 (13:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:31:22 +0000 (13:31 +0200)
* commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c':
  travis: fix dependencies

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge