Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 31 Oct 2012 15:03:18 +0000 (16:03 +0100)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 31 Oct 2012 15:03:18 +0000 (16:03 +0100)

Trivial merge