Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 28 Feb 2013 12:36:00 +0000 (13:36 +0100)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 28 Feb 2013 12:36:00 +0000 (13:36 +0100)

Trivial merge