Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
authorDawid Jagieła <lightnir@chem.univ.gda.pl>
Tue, 14 Oct 2014 22:30:49 +0000 (00:30 +0200)
committerDawid Jagieła <lightnir@chem.univ.gda.pl>
Tue, 14 Oct 2014 22:30:49 +0000 (00:30 +0200)

Trivial merge