Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 22 Jan 2015 10:18:23 +0000 (11:18 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 22 Jan 2015 10:18:23 +0000 (11:18 +0100)

Trivial merge