X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver-pl.spec;h=3b2c7ed31167cff3f4706df6c287d3ef7634d641;hb=018d1b1e4144e07e68531dab87a5080acffe2e65;hp=4c22319d71a59155c5664e0f98171db600b6736a;hpb=a6e1134d8bdb41b0146cdac83e4e82909e74cb47;p=util-vserver-pl.git

diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 4c22319..3b2c7ed 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -103,6 +103,11 @@ rm -fr %{buildroot}
 %{_mandir}/man8/vsh.8*
 
 %changelog
+* Mon May 10 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-pl-0.4-5
+
+* Mon May 10 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - util-vserver-pl-0.4-4
+- merged trellis branch to trunk
+
 * Wed Feb 24 2010 Marc Fiuczynski <mef@cs.princeton.edu> - util-vserver-pl-0.3-27
 - Need to print the exception string as part of the self.log, or else we
 - get a wrong number of argument error.