Merge remote-tracking branch 'origin/master'
authorMaciej Tronowski <mtro@man.poznan.pl>
Wed, 4 Mar 2015 09:22:22 +0000 (10:22 +0100)
committerMaciej Tronowski <mtro@man.poznan.pl>
Wed, 4 Mar 2015 09:22:22 +0000 (10:22 +0100)
commit7c9392626226b7d859c5bc321ab15326fa1a17c6
treecde01ed317ded5f70641a1ef549f64490681cafc
parentcc336624de8fa227d247f0e71bd24f829802deb6
parentacdd4e574dd1ec6f3b901cbdaefb2c155f09bbf5
Merge remote-tracking branch 'origin/master'

# Conflicts:
# qcg/fields.py
# qcg/forms.py
# qcg/templates/qcg/job_new.html
qcg/fields.py
qcg/forms.py
qcg/templates/qcg/job_new.html