Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Sun, 16 Aug 2015 14:10:13 +0000 (16:10 +0200)
committerJoel Rosdahl <joel@debian.org>
Sun, 16 Aug 2015 14:10:13 +0000 (16:10 +0200)
* upstream:
  New upstream release 2.7.0


Trivial merge