Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Mon, 9 Dec 2013 23:54:11 +0000 (01:54 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Mon, 9 Dec 2013 23:54:11 +0000 (01:54 +0200)

Trivial merge