Merge branch 'master' of https://git.man.poznan.pl/stash/scm/plgng/qcg-portal
authorMaciej Tronowski <mtro@man.poznan.pl>
Tue, 10 Feb 2015 14:36:50 +0000 (15:36 +0100)
committerMaciej Tronowski <mtro@man.poznan.pl>
Tue, 10 Feb 2015 14:36:50 +0000 (15:36 +0100)

Trivial merge