Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Fri, 6 May 2016 19:05:45 +0000 (20:05 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 6 May 2016 19:05:45 +0000 (20:05 +0100)
commit847c9f232efad6820cb7788994c2418a8cb89992
tree469b24d7dc8f5e59b2949d9a95780876f742311e
parent9fe33a4c946313f5929e9b52809c7aae35502785
parent644d099e5a0011e8906973a7366e4002dda382d9
Merge remote-tracking branch 'origin/master'