From: Michael Prokop <devnull@localhost>
Date: Mon, 26 Nov 2007 18:55:44 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.0.11~16
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=2124a2fe0748887da88662abc5ce7c2c643120b8;hp=96d98508225a5599fe5300fdebbb62c3b2cab1ad

Merge branches
---

diff --git a/.hgtags b/.hgtags
index d4a8c0a..7adb3d6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -7,3 +7,4 @@ eee4e6cfffc71de796d58374cf6282e7edfbcee1 0.0.6
 37555117e8379da8ac397caacbd5642d754a7322 0.0.7
 2cf43c6306828dd36ade5bef0b5bb1cd6956ca41 0.0.8
 676c6dd7088a5fad4c46b8d015686f7e9c233434 0.0.9
+f96c13ae469d3043ea8195c93e8a9d63f2ec5bef 0.0.10