Merge xpa (2.1.18-3+rpi1) import into refs/heads/workingbranch
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 17 Aug 2017 19:49:55 +0000 (20:49 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 17 Aug 2017 19:49:55 +0000 (20:49 +0100)

Trivial merge