From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 19 Apr 2011 14:56:48 +0000 (+0200)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.1~86
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f9a8c549deebf96792c3ba423e01545dc7caf95b;hp=6b6e4ff22259786d71d3c43736ccbd50e9d59d9b;p=platal.git

Merge remote branch 'origin/xorg/maint' into xorg/master
---

diff --git a/modules/admin.php b/modules/admin.php
index d96446d..34c3f44 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -846,7 +846,7 @@ class AdminModule extends PLModule
                     $grad_year = $promotion;
                     $entry_year = $promotion - 3;
                     $promo = 'D (en cours)';
-                    $hrpromo = $promo;
+                    $hrpromo = 'D' . $promotion;
                     $type = 'phd';
                     break;
                   default: