Merge branch 'master' of ssh://gparabola/parabolaweb

Conflicts:
	local_settings.py.example
	media/archweb.css
	packages/templatetags/package_extras.py
	public/views.py
	templates/packages/details.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/search.html
	templates/public/download.html
	templates/todolists/view.html

1 files changed, 18 insertions, 0 deletions

diff --git a/devel/migrations/0001_initial.py b/devel/migrations/0001_initial.py
new file mode 100644
index 00000000..c28fc20f
--- /dev/null
+++ b/devel/migrations/0001_initial.py
@@ -0,0 +1,18 @@
+# encoding: utf-8
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        pass
+
+
+    def backwards(self, orm):
+        pass
+
+
+    models = {}
+
+    complete_apps = ['devel']