X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver-pl.spec;h=03cfb59bfa34148f79ed8dcac2f84ec379f7af22;hb=9073b0ab787facd1602ed5a4369c9afa0247b70e;hp=3d1e6c1a345838c39fce4e04e64471cdcdca0111;hpb=417e8eb25ca47ac9b92c05393eaa131e7e083fd9;p=util-vserver-pl.git

diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 3d1e6c1..03cfb59 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -103,6 +103,9 @@ rm -fr %{buildroot}
 %{_mandir}/man8/vsh.8*
 
 %changelog
+* 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.