Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 20 Sep 2012 09:41:43 +0000 (11:41 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 20 Sep 2012 09:41:43 +0000 (11:41 +0200)

Trivial merge