Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 2 Sep 2013 15:06:12 +0000 (17:06 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 2 Sep 2013 15:06:12 +0000 (17:06 +0200)

Trivial merge