Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sat, 8 Nov 2014 22:48:49 +0000 (00:48 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Sat, 8 Nov 2014 22:48:49 +0000 (00:48 +0200)

Trivial merge