Merge pull request #4979 from jturcotte/2.2
authorMarkus Goetz <markus@woboq.com>
Tue, 21 Jun 2016 08:00:41 +0000 (10:00 +0200)
committerGitHub <noreply@github.com>
Tue, 21 Jun 2016 08:00:41 +0000 (10:00 +0200)
Memory improvements during propagation

1  2 
src/gui/folder.cpp

Simple merge