Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 28 Nov 2014 11:49:03 +0000 (12:49 +0100)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 28 Nov 2014 11:49:03 +0000 (12:49 +0100)

Trivial merge