From 1fec3da6a5ec7db190df686bd4c1a71f69308482 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 28 Dec 2008 00:23:21 +0100
Subject: [PATCH] Use last core on the master.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 classes/xorgsession.php | 2 +-
 core                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index dfe342c..2b2d09f 100644
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -289,7 +289,7 @@ class XorgSession extends PlSession
         return null;
     }
 
-    public function makePerms($perm)
+    protected function makePerms($perm, $is_admin)
     {
         $flags = new PlFlagSet();
         if ($perm == 'disabled' || $perm == 'ext') {
diff --git a/core b/core
index 7c8d702..e4f6c7d 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7c8d7022042ef34cbf8c16531a3b5eaecf46bfd2
+Subproject commit e4f6c7d0410bdc8c0f62abc4ee17092dbc52126c
-- 
2.1.4