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