From f873253f0e383f3922f540a9ef2aa5a9354ddf33 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 12 Jun 2013 12:46:32 +0100
Subject: [PATCH] test merge

---
 TODO | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 6c27605d..56f7716d 100644
--- a/TODO
+++ b/TODO
@@ -1,24 +1,24 @@
 FRONTEND
 ========
 
-* NetAddr::MAC ?
-
 * moar reports
 * (jeneric) device module tab
 
+DAEMON
+======
+
 BACKEND
 =======
 
 * db connect params as separate settings
 * new DBIC multi-prefetch
 * PING from workers
-
-DAEMON
-======
+* ask to set up guest user in deploy script
 
 CORE
 ====
 
+* NetAddr::MAC ?
 * VRF support
 * import legacy config file