Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 5 Nov 2014 21:44:43 +0000 (22:44 +0100)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 5 Nov 2014 21:44:43 +0000 (22:44 +0100)

Trivial merge