Merge branch 'bartek' into devel
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:57:22 +0000 (17:57 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Tue, 2 Oct 2012 15:57:22 +0000 (17:57 +0200)
commit923a2b705f727125bc987298ce71599a14b8de39
tree9af57dab9f7d7adc86abe66b0cd7efca94185e72
parenta9007f00ab549ca1598b839a5fb6b65fee79bdc7
parent372664d7bf52ad486c87a2e82f4e622488c95819
Merge branch 'bartek' into devel