Merge branch 'master' into newmc

Conflicts:
	tmpl/pb_entry.en

diff --cc tmpl/pb_entry.en
index 1d595b2290b69162f527f46db57434e31a7d35ad,5c5072cc15d117e67abc5ed8787ca9d0a782e729..e8d8f248eebb3a32cb99b48c3e9d3a922ff9863a
--- 1/tmpl/pb_entry.en
--- 2/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@@ -31,17 -31,18 +31,18 @@@ To submit solutions to this problem, pl
  <div class="form-group"><label for="prog">File:</label><input id="prog" name="prog" type="file"></div>
  <div class="form-group"><label for="source_code">Source code:</label> <textarea class="form-control" id="source_code" name="source_code"></textarea></div>
  <div class="form-group"><label for="prog_format">File format:</label><select id="prog_format" name="prog_format" class="form-control" required>
 -<option value="C">C (gcc)</option>
 -<option value="CPP" selected>C++ (g++)</option>
 -<option value="GCCGO">Go (gccgo)</option>
 -<option value="GOLANG">Go (gc)</option>
 +<option value="C">C11 (gcc 4.7.2)</option>
 +<option value="CPP" selected>C++11 (g++ 4.7.2)</option>
 +<option value="GCCGO">Go (gccgo 4.7.2)</option>
 +<option value="GOLANG">Go (gc 1.0.2)</option>
+ <option value="GOLFSCRIPT">Golfscript (golfscript.rb)</option>
 -<option value="HASKELL">Haskell (ghc)</option>
 -<option value="JAVA">Java (javac)</option>
 -<option value="PASCAL">Pascal (fpc)</option>
 -<option value="PERL">Perl (perl)</option>
 -<option value="PYTHON">Python (python)</option>
 -<option value="RUBY">Ruby (ruby)</option>
 -<option value="SBCL">Common Lisp (sbcl)</option>
 +<option value="HASKELL">Haskell (ghc 7.4.1)</option>
 +<option value="JAVA">Java (openjdk 7u75)</option>
 +<option value="PASCAL">Pascal (fpc 2.6.0)</option>
 +<option value="PERL">Perl (perl 5.14.2)</option>
 +<option value="PYTHON">Python (python 2.7.3)</option>
 +<option value="RUBY">Ruby (ruby 2.2.1)</option>
 +<option value="SBCL">Common Lisp (sbcl 1.0.57)</option>
  </select></div>
  
  <input type="submit" value="Submit job" class="btn btn-primary">