From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 25 Apr 2014 19:46:02 +0000 (+0200)
Subject: Merged branch 'pkg/deb/master' of github.com/alindobre/rrdtool-1.x.
X-Git-Tag: debian/1.4.8-1~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e9e546d85fff2b5be6c867e4fd913afde5d8c69;p=pkg-rrdtool.git

Merged branch 'pkg/deb/master' of github.com/alindobre/rrdtool-1.x.
---

5e9e546d85fff2b5be6c867e4fd913afde5d8c69
diff --cc debian/patches/series
index 0420162,e472686..3222309
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,7 -4,3 +4,4 @@@ no-rpath-for-rub
  no-rpath-for-perl
  implicit-decl-fix
  bts530814-hurd
- tcl-8.5
- ruby_bindings_format_string.patch
- bts664724-rrdcached-j-segfault
 +CVE-2013-2131