From e5071d6d09dbaf831dd3033f5909075a8e4e70cf Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Tue, 26 Jan 2010 20:28:41 +0100
Subject: [PATCH] *#$@ merge

---
 run_fpdb.py | 62 ++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/run_fpdb.py b/run_fpdb.py
index a5c06952..eef325c9 100755
--- a/run_fpdb.py
+++ b/run_fpdb.py
@@ -1,31 +1,31 @@
-#!/usr/bin/python
-
-#Copyright 2008 Carl Gherardi
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as published by
-#the Free Software Foundation, version 3 of the License.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with this program. If not, see <http://www.gnu.org/licenses/>.
-#In the "official" distribution you can find the license in
-#agpl-3.0.txt in the docs folder of the package.
-
-
-import os
-import sys
-
-# sys.path[0] holds the dir run_fpdb.py was in
-sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
-
-import fpdb
-
-
-if __name__ == "__main__":
-    me = fpdb.fpdb()
-    me.main()
-    exit()
+#!/usr/bin/python
+
+#Copyright 2008 Carl Gherardi
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in
+#agpl-3.0.txt in the docs folder of the package.
+
+
+import os
+import sys
+
+# sys.path[0] holds the dir run_fpdb.py was in
+sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
+
+import fpdb
+
+
+if __name__ == "__main__":
+    me = fpdb.fpdb()
+    me.main()
+    exit()