Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
authorMichael Vogel <icarus@dabo.de>
Sat, 2 Jul 2016 18:22:41 +0000 (20:22 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 2 Jul 2016 18:22:41 +0000 (20:22 +0200)
commita9da0e9022158faf571839a7cc8412b9e63e566e
tree0549dcd020b822cd703f8fea33dacef58d745a31
parent06af9e017c0f8a4809649390f812cbade5ded677
parent3f6ed00ded44ecec946f718296615e330893e5b5
Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords