Merge remote-tracking branch 'upstream/master' into 1601-gcontact
authorMichael Vogel <icarus@dabo.de>
Sat, 9 Jan 2016 07:17:28 +0000 (08:17 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 9 Jan 2016 07:17:28 +0000 (08:17 +0100)
commitf51e9d94ce83357633a2e22efdc0b4203c97e0bf
treec0d9dd2724814b404789de6b6e524c05e6a167fc
parente59e019fa19a2e811e914b811058daa9fc372041
parent0249534f5ddb9605c073ef5820f9f6a960912bf7
Merge remote-tracking branch 'upstream/master' into 1601-gcontact