Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
authorMichael Vogel <icarus@dabo.de>
Sat, 28 May 2016 11:53:05 +0000 (13:53 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 28 May 2016 11:53:05 +0000 (13:53 +0200)
commit06af9e017c0f8a4809649390f812cbade5ded677
tree0e43c84d926458eaad6de0de1f7c54c7f2d71692
parentb3eb963a2bdff7735b32085f30c9a715d14482f0
parent63eda5ce9f161e7e6d9cd163b7b633ee0d65b779
Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
fromgplus/fromgplus.php