Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 17 Dec 2014 10:06:19 +0000 (11:06 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Wed, 17 Dec 2014 10:06:19 +0000 (11:06 +0100)

Trivial merge