Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 23 Aug 2013 12:11:37 +0000 (14:11 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 23 Aug 2013 12:11:37 +0000 (14:11 +0200)

Trivial merge