Merge tag 'upstream/3.014'
authorgregor herrmann <gregoa@debian.org>
Mon, 7 Dec 2015 14:31:16 +0000 (15:31 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 7 Dec 2015 14:31:16 +0000 (15:31 +0100)
commit5b0747237ea89371d75ddc9b5e9ed001e54032ff
tree042ab8a6e88f3c60510b47ac5c818200404ea30c
parent6203468ab9428143b606bc1ff8061012044e9e14
parent6de0ec611352d0456ccf19b387bfc7c5d940d5c6
Merge tag 'upstream/3.014'

Upstream version 3.014