From 215d646671e9bfb5e0e0c4bf9ce6ea4859189618 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mar 08 2013 13:28:15 +0000
Subject: Merge branch 'f18' into f17


Conflicts:
	.gitignore

---

diff --git a/.gitignore b/.gitignore
index 88a4d1e..27fff2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/audiocd-kio-4.9.1.tar.xz
-/audiocd-kio-4.9.2.tar.xz
-/audiocd-kio-4.9.3.tar.xz
-/audiocd-kio-4.9.4.tar.xz
-/audiocd-kio-4.9.5.tar.xz
 /audiocd-kio-4.10.1.tar.xz