Merge tag 'wps-3.4' into wps-merge
commit5d7cf382c5e3e3a08c5de797f872b80dcb576331
authorJan Mandel <jan.mandel@gmail.com>
Fri, 3 May 2019 02:50:26 +0000 (2 20:50 -0600)
committerJan Mandel <jan.mandel@gmail.com>
Fri, 3 May 2019 02:50:26 +0000 (2 20:50 -0600)
tree339c724d085c5dbe145f86fcef8aacdb21a8d5ed
parentb0c54cccdbafc19a5e453ca3f30b5aa15c12ca02
parent40350e2889a2309c091fb811fd3c061eda32660f
Merge tag 'wps-3.4' into wps-merge