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)
commitee31fda62687c2df1c9725fc73fc965302ce4a99
treefafe55fcf90fa28ac2e63de7fb96eed145dabb46
parent2d804082c5fabc7e9e45cca74a1c0ee7d011706a
parent268bd20e383eec76523867b7a78eac39e08606c4
Merge branch 'upstream'

* upstream:
  New upstream release 2.7.0