Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 14 Sep 2014 15:35:36 +0000 (18:35 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 14 Sep 2014 15:35:36 +0000 (18:35 +0300)
Conflicts:
mm/truncate.c


Trivial merge