From 9b3069a1eacd3cbda0bfe565925e80f667f6c96d Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 23 Apr 2014 11:22:01 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 TODO.txt |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 9902ef3..6dcae10 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -22,10 +22,6 @@
 Server
 --------------------------------------
 
-- Add a backend plugin to configure network card settings. The IP address
-  settings are stored in the server_ip table.
--- This works now on Debian and Ubuntu Linux.
-
 
 Mail module
 --------------------------------------

--
Gitblit v1.9.1