Merge remote-tracking branch 'origin/master'
authorMaciej Tronowski <mtro@man.poznan.pl>
Fri, 27 Feb 2015 16:17:15 +0000 (17:17 +0100)
committerMaciej Tronowski <mtro@man.poznan.pl>
Fri, 27 Feb 2015 16:17:15 +0000 (17:17 +0100)
# Conflicts:
# plgng/settings.py
# qcg/forms.py
# qcg/views.py


No differences found