commit 7b544acbe7498ace347279ec8649aed76c95e7b6 parent 4d92775d31f1e93d94ba8561e8841366ee404f89 Author: Jachiet Louis <louis@jachiet.com> Date: Sat, 5 Apr 2014 12:57:44 +0200 Merge branch 'master' of gitorious.org:ens-ulm-1/ens-ulm-1 Conflicts: contest/mc/lecture.cpp Diff is too large, output suppressed.