Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 18 May 2012 11:24:20 +0000 (13:24 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 18 May 2012 11:24:20 +0000 (13:24 +0200)

Trivial merge