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)
commitcc19da48b2818c23cd4643ea62405a47da02037a
tree4d081bb2f24913cf593aa4c16401c57869102946
parent78b4dac5bf3dbd9c6a34db27bf0ce32d10e546a3
parente85ef8224efe5a0a5311262aa3b602f2f92d95b4
Merge remote-tracking branch 'origin/master'

# Conflicts:
# plgng/settings.py
# qcg/forms.py
# qcg/views.py
qcg/forms.py
qcg/templates/qcg/jobs.html
qcg/views.py