Merge branch 'devel' of mmka:unres into devel
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 17 Jun 2014 09:42:27 +0000 (11:42 +0200)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Tue, 17 Jun 2014 09:42:27 +0000 (11:42 +0200)

Trivial merge