From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 4 Apr 2011 10:17:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/selinux'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60b906316e8134cd62fb85cba5a12cf89ee84286;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/selinux'

Conflicts:
	pkgs/ed/ed.nm
---

60b906316e8134cd62fb85cba5a12cf89ee84286
diff --cc pkgs/ed/ed.nm
index 73f1453f6,fb3469625..ca695886b
--- a/pkgs/ed/ed.nm
+++ b/pkgs/ed/ed.nm
@@@ -26,7 -26,7 +26,7 @@@ include $(PKGROOT)/Includ
  
  PKG_NAME       = ed
  PKG_VER        = 1.5
- PKG_REL        = 1
 -PKG_REL        = 2
++PKG_REL        = 3
  
  PKG_MAINTAINER =
  PKG_GROUPS     = Application/Text