[or-cvs] r21440: {projects} karsten's branch was merged (projects/todo)

[Sebastian Hahn]

Author: sebastian
Date: 2010-01-18 23:23:07 +0000 (Mon, 18 Jan 2010)
New Revision: 21440

Modified:
   projects/todo/git-branches
Log:
karsten's branch was merged

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-01-18 23:05:05 UTC (rev 21439)
+++ projects/todo/git-branches	2010-01-18 23:23:07 UTC (rev 21440)
@@ -3,9 +3,6 @@
 - Log at level notice whenever we get a new control connection
   sebastian/bug1196
 
-- Fix bridge stats
-  karsten/fix-bridge-stats-master
-
 Active branches that want more attention before merging:
 
 - AdvertisedPlatform allows for a custom uname, problematic for metrics stuff