Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 19 Jul 2012 23:49:02 +0000 (01:49 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 19 Jul 2012 23:49:02 +0000 (01:49 +0200)

Trivial merge