Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Sun, 5 Apr 2015 21:04:43 +0000 (23:04 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Sun, 5 Apr 2015 21:04:43 +0000 (23:04 +0200)

Trivial merge