Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
authorMichael Vogel <icarus@dabo.de>
Fri, 24 Jun 2016 07:40:12 +0000 (09:40 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 24 Jun 2016 07:40:12 +0000 (09:40 +0200)
commit83e82163d70745efece21826d1037c2e6e073ec3
tree8f6e37d32fe5abb1a68b1fd0a04298d2378045da
parent06af9e017c0f8a4809649390f812cbade5ded677
parentb346e0e342b83f46ba1f5e2f99db780c4f305ffa
Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords