Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 6 Nov 2013 10:01:12 +0000 (11:01 +0100)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Wed, 6 Nov 2013 10:01:12 +0000 (11:01 +0100)

Trivial merge